July 2006 - Wine-Commits - list.winehq.org

Jacek Caban : widl: Added ATTR_BINDABLE handling to add_func_desc.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: b86bc2b634490bb1da4191c2a9367bf398265ae1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b86bc2b634490bb1da4191c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 27 20:41:50 2006 +0200 widl: Added ATTR_BINDABLE handling to add_func_desc. --- tools/widl/write_msft.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 2509c6c..67733b0 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1340,6 +1340,9 @@ static HRESULT add_func_desc(msft_typein case ATTR_RESTRICTED: funcflags |= 0x1; /* FUNCFLAG_FRESTRICTED */ break; + case ATTR_BINDABLE: + funcflags |= 0x4; /* FUNCFLAG_BINDABLE */ + break; default: warning("add_func_desc: ignoring attr %d\n", attr->type); break;

1 0

Jacek Caban : widl: Store typekind in msft_typeinfo_t to fix ATTR_DUAL handling.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: 4d76264f3e26272616b794fa6bc31028133afd70 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d76264f3e26272616b794f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 27 20:40:56 2006 +0200 widl: Store typekind in msft_typeinfo_t to fix ATTR_DUAL handling. --- tools/widl/write_msft.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 212d12d..2509c6c 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -101,6 +101,8 @@ typedef struct _msft_typeinfo_t msft_typelib_t *typelib; MSFT_TypeInfoBase *typeinfo; + int typekind; + unsigned int var_data_allocated; int *var_data; @@ -1260,7 +1262,7 @@ static HRESULT add_func_desc(msft_typein id = ((0x6000 | (typeinfo->typeinfo->datatype2 & 0xffff)) << 16) | index; - switch(typeinfo->typeinfo->typekind & 15) { + switch(typeinfo->typekind) { case TKIND_DISPATCH: funckind = 0x4; /* FUNC_DISPATCH */ break; @@ -1346,8 +1348,8 @@ static HRESULT add_func_desc(msft_typein switch(invokekind) { case 0x2: /* INVOKE_PROPERTYGET */ - if((num_params != 0 && (typeinfo->typeinfo->typekind & 15) == TKIND_DISPATCH) - || (num_params != 1 && (typeinfo->typeinfo->typekind & 15) == TKIND_INTERFACE)) { + if((num_params != 0 && typeinfo->typekind == TKIND_DISPATCH) + || (num_params != 1 && typeinfo->typekind == TKIND_INTERFACE)) { error("expecting no args on a propget func\n"); return S_FALSE; } @@ -1528,12 +1530,12 @@ static HRESULT add_func_desc(msft_typein namedata = typeinfo->typelib->typelib_segment_data[MSFT_SEG_NAME] + name_offset; if (*((INT *)namedata) == -1) { *((INT *)namedata) = typeinfo->typelib->typelib_typeinfo_offsets[typeinfo->typeinfo->typekind >> 16]; - if((typeinfo->typeinfo->typekind & 15) == TKIND_MODULE) + if(typeinfo->typekind == TKIND_MODULE) namedata[9] |= 0x10; } else namedata[9] &= ~0x10; - if((typeinfo->typeinfo->typekind & 15) == TKIND_MODULE) + if(typeinfo->typekind == TKIND_MODULE) namedata[9] |= 0x20; if(invokekind != 0x4 /* INVOKE_PROPERTYPUT */ && invokekind != 0x8 /* INVOKE_PROPERTYPUTREF */) { @@ -1638,7 +1640,7 @@ static HRESULT add_var_desc(msft_typeinf typeinfo->datawidth += var_alignment - 1; typeinfo->datawidth &= ~(var_alignment - 1); - switch(typeinfo->typeinfo->typekind & 0xf) { + switch(typeinfo->typekind) { case TKIND_ENUM: write_value(typeinfo->typelib, &typedata[4], VT_I4, &var->eval->cval); var_kind = 2; /* VAR_CONST */ @@ -1655,7 +1657,7 @@ static HRESULT add_var_desc(msft_typeinf var_alignment = 4; break; default: - error("add_var_desc: unhandled type kind %d\n", typeinfo->typeinfo->typekind & 0xf); + error("add_var_desc: unhandled type kind %d\n", typeinfo->typekind); break; } @@ -1692,12 +1694,12 @@ static HRESULT add_var_desc(msft_typeinf namedata = typeinfo->typelib->typelib_segment_data[MSFT_SEG_NAME] + offset; if (*((INT *)namedata) == -1) { *((INT *)namedata) = typeinfo->typelib->typelib_typeinfo_offsets[typeinfo->typeinfo->typekind >> 16]; - if((typeinfo->typeinfo->typekind & 15) != TKIND_DISPATCH) + if(typeinfo->typekind != TKIND_DISPATCH) namedata[9] |= 0x10; } else namedata[9] &= ~0x10; - if ((typeinfo->typeinfo->typekind & 15) == TKIND_ENUM) { + if (typeinfo->typekind == TKIND_ENUM) { namedata[9] |= 0x20; } typeinfo->var_names[var_num] = offset; @@ -1745,6 +1747,7 @@ static msft_typeinfo_t *create_msft_type typelib->typelib_segment_data[MSFT_SEG_NAME][nameoffset + 9] = 0x38; *((int *)&typelib->typelib_segment_data[MSFT_SEG_NAME][nameoffset]) = typeinfo_offset; + msft_typeinfo->typekind = kind; msft_typeinfo->typeinfo = typeinfo; typeinfo->typekind |= kind | 0x20; @@ -1781,6 +1784,7 @@ static msft_typeinfo_t *create_msft_type case ATTR_DUAL: /* FIXME: check interface is compatible */ + typeinfo->typekind = (typeinfo->typekind & ~0xff) | 0x34; typeinfo->flags |= 0x140; /* TYPEFLAG_FDUAL | TYPEFLAG_FOLEAUTOMATION */ break;

1 0

Jacek Caban : shdocvw: Added test of GetControlInfo.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: 89b443d55904ce5f88caea3ae71e2af3f5ff18f1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=89b443d55904ce5f88caea3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 27 23:30:36 2006 +0200 shdocvw: Added test of GetControlInfo. --- dlls/shdocvw/oleobject.c | 5 ++++- dlls/shdocvw/tests/webbrowser.c | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index dc790b3..c50b302 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -607,7 +607,10 @@ static ULONG WINAPI OleControl_Release(I static HRESULT WINAPI OleControl_GetControlInfo(IOleControl *iface, LPCONTROLINFO pCI) { WebBrowser *This = CONTROL_THIS(iface); - FIXME("(%p)->(%p)\n", This, pCI); + + TRACE("(%p)->(%p)\n", This, pCI); + + /* Tests show that this function should be not implemented */ return E_NOTIMPL; } diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 7fa58c0..ce9cae4 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -809,6 +809,25 @@ static void test_ie_funcs(IUnknown *unk) IWebBrowser2_Release(wb); } +static void test_GetControlInfo(IUnknown *unk) +{ + IOleControl *control; + CONTROLINFO info; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IOleControl, (void**)&control); + ok(hres == S_OK, "Could not get IOleControl: %08lx\n", hres); + if(FAILED(hres)) + return; + + hres = IOleControl_GetControlInfo(control, &info); + ok(hres == E_NOTIMPL, "GetControlInfo failed: %08lx, exxpected E_NOTIMPL\n", hres); + hres = IOleControl_GetControlInfo(control, NULL); + ok(hres == E_NOTIMPL, "GetControlInfo failed: %08lx, exxpected E_NOTIMPL\n", hres); + + IOleControl_Release(control); +} + static void test_WebBrowser(void) { IUnknown *unk = NULL; @@ -826,6 +845,7 @@ static void test_WebBrowser(void) test_DoVerb(unk); test_ClientSite(unk, NULL); test_ie_funcs(unk); + test_GetControlInfo(unk); ref = IUnknown_Release(unk); ok(ref == 0, "ref=%ld, expected 0\n", ref);

1 0

Michael Stefaniuc : Fix 2 "static is not at beginning of declaration" warnings.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: 2783e72a65a329390ef001888b9097b31836e861 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2783e72a65a329390ef0018… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 27 22:19:31 2006 +0200 Fix 2 "static is not at beginning of declaration" warnings. --- dlls/d3d9/vertexdeclaration.c | 2 +- dlls/gdi/tests/font.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 1903091..c901d92 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -30,7 +30,7 @@ typedef struct _D3DDECLTYPE_INFO { int typesize; } D3DDECLTYPE_INFO; -D3DDECLTYPE_INFO static const d3d_dtype_lookup[D3DDECLTYPE_UNUSED] = { +static D3DDECLTYPE_INFO const d3d_dtype_lookup[D3DDECLTYPE_UNUSED] = { {D3DDECLTYPE_FLOAT1, 1, sizeof(float)}, {D3DDECLTYPE_FLOAT2, 2, sizeof(float)}, {D3DDECLTYPE_FLOAT3, 3, sizeof(float)}, diff --git a/dlls/gdi/tests/font.c b/dlls/gdi/tests/font.c index 971dcf3..c4ac60d 100644 --- a/dlls/gdi/tests/font.c +++ b/dlls/gdi/tests/font.c @@ -336,7 +336,7 @@ static void test_GetCharABCWidthsW(void) static void test_text_extents(void) { - const static WCHAR wt[] = {'O','n','e','\n','t','w','o',' ','3',0}; + static const WCHAR wt[] = {'O','n','e','\n','t','w','o',' ','3',0}; LPINT extents; INT i, len, fit1, fit2; LOGFONTA lf;

1 0

Andrew Talbot : mapi32/tests: Write-strings warning fix.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: 99c5d1957ab9e58cceb482029376898fc5b94417 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=99c5d1957ab9e58cceb4820… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jul 27 22:47:09 2006 +0100 mapi32/tests: Write-strings warning fix. --- dlls/mapi32/tests/prop.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index 0e4edf0..061d7d1 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -897,7 +897,7 @@ static void test_LpValFindProp(void) static void test_FBadRglpszA(void) { LPSTR lpStrs[4]; - char *szString = "A String"; + static CHAR szString[] = "A String"; BOOL bRet; pFBadRglpszA = (void*)GetProcAddress(hMapi32, "FBadRglpszA(a)8"); @@ -922,7 +922,7 @@ static void test_FBadRglpszA(void) static void test_FBadRglpszW(void) { LPWSTR lpStrs[4]; - WCHAR szString[] = { 'A',' ','S','t','r','i','n','g','\0' }; + static WCHAR szString[] = { 'A',' ','S','t','r','i','n','g','\0' }; BOOL bRet; pFBadRglpszW = (void*)GetProcAddress(hMapi32, "FBadRglpszW(a)8"); @@ -1005,7 +1005,7 @@ static void test_FBadRow(void) static void test_FBadProp(void) { - WCHAR szEmpty[] = { '\0' }; + static WCHAR szEmpty[] = { '\0' }; GUID iid; ULONG pt, res; SPropValue pv;

1 0

Michael Stefaniuc : msi: 0xdeadbeef is too big for a signed int thus producing sign
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: b222f1bca407d0ada64bda137b91d1f9b25ebb50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b222f1bca407d0ada64bda1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 27 21:46:38 2006 +0200 msi: 0xdeadbeef is too big for a signed int thus producing sign comparison warnings when compared to an int variable. Use 0xdeadbee instead. --- dlls/msi/tests/package.c | 200 +++++++++++++++++++++++----------------------- 1 files changed, 100 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b222f1bca407d0ada64…

1 0

Andrew Talbot : msi/tests: Write-strings warning fix.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: ccf7f0777a464aef3333f1003a9514cc0efaa947 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ccf7f0777a464aef3333f10… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jul 27 20:11:20 2006 +0100 msi/tests: Write-strings warning fix. --- dlls/msi/tests/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 609fafa..6ed3a4b 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -694,7 +694,7 @@ static void test_packagecoltypes(void) { MSIHANDLE hdb, view, rec; char path[MAX_PATH]; - LPSTR query; + LPCSTR query; UINT r, count; CoInitialize(NULL);

1 0

Andrew Talbot : crypt32/tests: Write-strings warnings fix.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: 2c23192704f48df7227e278964804a0d46a0dc61 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2c23192704f48df7227e278… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jul 27 19:45:58 2006 +0100 crypt32/tests: Write-strings warnings fix. --- dlls/crypt32/tests/encode.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 712c1b2..1372934 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -806,6 +806,8 @@ static void test_encodeUnicodeName(DWORD CERT_RDN_ATTR attrs[2]; CERT_RDN rdn; CERT_NAME_INFO info; + static CHAR oid_common_name[] = szOID_COMMON_NAME, + oid_sur_name[] = szOID_SUR_NAME; BYTE *buf = NULL; DWORD size = 0; BOOL ret; @@ -830,7 +832,7 @@ static void test_encodeUnicodeName(DWORD /* Check with one CERT_RDN_ATTR, that has an invalid character for the * encoding (the NULL). */ - attrs[0].pszObjId = szOID_COMMON_NAME; + attrs[0].pszObjId = oid_common_name; attrs[0].dwValueType = CERT_RDN_PRINTABLE_STRING; attrs[0].Value.cbData = sizeof(commonNameW); attrs[0].Value.pbData = (BYTE *)commonNameW; @@ -846,11 +848,11 @@ static void test_encodeUnicodeName(DWORD /* Check with two NULL-terminated CERT_RDN_ATTRs. Note DER encoding * forces the order of the encoded attributes to be swapped. */ - attrs[0].pszObjId = szOID_COMMON_NAME; + attrs[0].pszObjId = oid_common_name; attrs[0].dwValueType = CERT_RDN_PRINTABLE_STRING; attrs[0].Value.cbData = 0; attrs[0].Value.pbData = (BYTE *)commonNameW; - attrs[1].pszObjId = szOID_SUR_NAME; + attrs[1].pszObjId = oid_sur_name; attrs[1].dwValueType = CERT_RDN_PRINTABLE_STRING; attrs[1].Value.cbData = 0; attrs[1].Value.pbData = (BYTE *)surNameW;

1 0

Stefan Siebert : winebrowser: Pass any given argument that is not a mailto URL to the browser.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: f439f216410094ab7e4dbda5ff875c785d895f33 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f439f216410094ab7e4dbda… Author: Stefan Siebert <stefan.siebert(a)web.de> Date: Thu Jul 27 18:08:23 2006 +0200 winebrowser: Pass any given argument that is not a mailto URL to the browser. --- programs/winebrowser/main.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index ca07c44..690f931 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -28,7 +28,7 @@ * taken from a registry key. * * The argument may be a regular Windows file name, a file URL, an - * http(s) URL or a mailto URL. In the first three cases the argument + * URL or a mailto URL. In the first three cases the argument * will be fed to a web browser. In the last case the argument is fed * to a mail client. A mailto URL is composed as follows: * @@ -209,12 +209,9 @@ int main(int argc, char *argv[]) } } - if (!strncasecmp( url, "http:", 5 ) || !strncasecmp( url, "https:", 6 )) - return open_http_url( url ); - if (!strncasecmp( url, "mailto:", 7 )) return open_mailto_url( url ); - fprintf( stderr, "winebrowser: cannot handle this type of URL: %s\n", url ); - return 1; + /* let the browser decide how to handle the given url */ + return open_http_url( url ); }

1 0

Mike McCormack : msi: Fix some memory leaks.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: 525ceb7085b581e35f1bd32c98aff153745fa107 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=525ceb7085b581e35f1bd32… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jul 27 23:17:57 2006 +0900 msi: Fix some memory leaks. --- dlls/msi/msi.c | 1 + dlls/msi/registry.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 8c9139d..84557d7 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1440,6 +1440,7 @@ UINT WINAPI MSI_ProvideQualifiedComponen else rc = MSI_GetComponentPath(szProduct, component, lpPathBuf, pcchPathBuf); + msi_free( info ); if (rc != INSTALLSTATE_LOCAL) return ERROR_FILE_NOT_FOUND; diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index e9c33f1..ddeb3a6 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -918,6 +918,7 @@ UINT WINAPI MSI_EnumComponentQualifiers( if (val_sz > val_max) { val_max = val_sz + sizeof (WCHAR); + msi_free( val ); val = msi_alloc( val_max * sizeof (WCHAR) ); if (!val) goto end;

1 0