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

Jacek Caban : include: Added missing importlib.
by Alexandre Julliard April 21, 2006

April 21, 2006

Module: wine Branch: refs/heads/master Commit: 8e457d04e475d5216696df081068647804b0fa43 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8e457d04e475d5216696df0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 21 16:51:05 2006 +0200 include: Added missing importlib. --- include/exdisp.idl | 2 +- include/mshtml.idl | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/exdisp.idl b/include/exdisp.idl index 898dd1e..71d4209 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -37,7 +37,7 @@ #include <exdispid.h> library SHDocVw { -/* importlib("stdole2.tlb"); */ +importlib("stdole2.tlb"); /***************************************************************************** diff --git a/include/mshtml.idl b/include/mshtml.idl index 50d31b1..6ce9772 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -57,6 +57,8 @@ interface IHTMLFiltersCollection : IDisp library MSHTML { +importlib("stdole2.tlb"); + /***************************************************************************** * IHTMLStyle interface */

1 0

Alexandre Julliard : server: Ignore the SizeOfHeaders field and compute the correct size ourselves.
by Alexandre Julliard April 21, 2006

April 21, 2006

Module: wine Branch: refs/heads/master Commit: d59fa772d552673f4aabf717228fe12821425c17 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d59fa772d552673f4aabf71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 21 16:16:11 2006 +0200 server: Ignore the SizeOfHeaders field and compute the correct size ourselves. --- server/mapping.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index e636ae8..22bf8a1 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -243,7 +243,7 @@ static int get_image_params( struct mapp mapping->size = ROUND_SIZE( nt.OptionalHeader.SizeOfImage ); mapping->base = (void *)nt.OptionalHeader.ImageBase; - mapping->header_size = nt.OptionalHeader.SizeOfHeaders; + mapping->header_size = pos + size; mapping->protect = VPROT_IMAGE; /* sanity check */

1 0

Jacek Caban : widl: Added importlib parsing code.
by Alexandre Julliard April 21, 2006

April 21, 2006

Module: wine Branch: refs/heads/master Commit: 8cd409facf35c74883f0b9ed215ef357cc6d2800 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8cd409facf35c74883f0b9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 21 12:20:56 2006 +0200 widl: Added importlib parsing code. --- tools/widl/parser.y | 3 +++ tools/widl/typelib.c | 7 +++++++ tools/widl/typelib.h | 1 + 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 7ab2edf..9f288bf 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -251,6 +251,7 @@ imp_statements: {} | imp_statements coclassdef { if (!parse_only) add_coclass($2); } | imp_statements moduledef { if (!parse_only) add_module($2); } | imp_statements statement {} + | imp_statements importlib {} ; int_statements: { $$ = NULL; } @@ -277,6 +278,8 @@ import_start: tIMPORT aSTRING ';' { ass import: import_start imp_statements aEOF {} ; +importlib: tIMPORTLIB '(' aSTRING ')' { if(!parse_only) add_importlib($3); } + libraryhdr: tLIBRARY aIDENTIFIER { $$ = $2; } ; library_start: attributes libraryhdr '{' { start_typelib($2, $1); diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index fe32c8f..fb8fd66 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -278,3 +278,10 @@ void add_typedef(type_t *tdef, var_t *na LINK(entry, typelib->entry); typelib->entry = entry; } + +void add_importlib(const char *name) +{ + if(!typelib) return; + + warning("importlib is not yet supported.\n"); +} diff --git a/tools/widl/typelib.h b/tools/widl/typelib.h index d6ba5a7..0e1ed76 100644 --- a/tools/widl/typelib.h +++ b/tools/widl/typelib.h @@ -30,6 +30,7 @@ extern void add_module(type_t *module); extern void add_struct(type_t *structure); extern void add_enum(type_t *enumeration); extern void add_typedef(type_t *tdef, var_t *name); +extern void add_importlib(const char *name); /* Copied from wtypes.h. Not included directly because that would create a * circular dependency (after all, wtypes.h is generated by widl...) */

1 0

Jacek Caban : shdocvw: Don't create IE default window in embedding mode.
by Alexandre Julliard April 21, 2006

April 21, 2006

Module: wine Branch: refs/heads/master Commit: 238afbb688045dce27f3226c417c5907b3e9c1a5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=238afbb688045dce27f3226… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 21 12:14:57 2006 +0200 shdocvw: Don't create IE default window in embedding mode. --- dlls/shdocvw/iexplore.c | 37 +++++++++++++++++++++---------------- 1 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 2b3d7b0..91548fd 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -123,7 +123,6 @@ static void create_frame_hwnd(InternetEx static IWebBrowser2 *create_ie_window(LPCWSTR url) { IWebBrowser2 *wb = NULL; - MSG msg; VARIANT var_url; InternetExplorer_Create(NULL, &IID_IWebBrowser2, (void**)&wb); @@ -140,13 +139,6 @@ static IWebBrowser2 *create_ie_window(LP SysFreeString(V_BSTR(&var_url)); - /* run the message loop for this thread */ - while (GetMessageW(&msg, 0, 0, 0)) - { - TranslateMessage(&msg); - DispatchMessageW(&msg); - } - return wb; } @@ -184,8 +176,8 @@ HRESULT InternetExplorer_Create(IUnknown */ DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) { - LPWSTR url; - DWORD len; + IWebBrowser2 *wb = NULL; + MSG msg; HRESULT hres; FIXME("%s %d\n", debugstr_a(szCommandLine), nShowWindow); @@ -198,15 +190,28 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLi ExitProcess(1); } - /* FIXME: parse the command line properly, handle -Embedding */ + if(strcmp(szCommandLine, "-Embedding")) { + LPWSTR url; + DWORD len; - len = MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, NULL, 0); - url = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, url, len); + len = MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, NULL, 0); + url = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, url, len); - create_ie_window(url); + wb = create_ie_window(url); + + HeapFree(GetProcessHeap(), 0, url); + } + + /* run the message loop for this thread */ + while (GetMessageW(&msg, 0, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } - HeapFree(GetProcessHeap(), 0, url); + if(wb) + IWebBrowser2_Release(wb); register_class_object(FALSE);

1 0

Jacek Caban : shdocvw: Use InternetExplorer object in create_ie_window.
by Alexandre Julliard April 21, 2006

April 21, 2006

Module: wine Branch: refs/heads/master Commit: d5c69bf4af04f211a9f8cea412cda026a0c408ab URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d5c69bf4af04f211a9f8cea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 21 12:13:53 2006 +0200 shdocvw: Use InternetExplorer object in create_ie_window. --- dlls/shdocvw/iexplore.c | 488 ++++------------------------------------------- dlls/shdocvw/shdocvw.h | 1 2 files changed, 42 insertions(+), 447 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d5c69bf4af04f211a9f…

1 0

Mike McCormack : rpcrt4: Invalid sockets should have a value of -1.
by Alexandre Julliard April 21, 2006

April 21, 2006

Module: wine Branch: refs/heads/master Commit: 481cec40069392e8e7c48cd62d8dc84e10f2cf8b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=481cec40069392e8e7c48cd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Apr 21 18:38:01 2006 +0900 rpcrt4: Invalid sockets should have a value of -1. --- dlls/rpcrt4/rpc_transport.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 4faad59..563a0df 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -254,7 +254,10 @@ typedef struct _RpcConnection_tcp static RpcConnection *rpcrt4_conn_tcp_alloc(void) { - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RpcConnection_tcp)); + RpcConnection_tcp *tcpc; + tcpc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RpcConnection_tcp)); + tcpc->sock = -1; + return &tcpc->common; } static RPC_STATUS rpcrt4_ncacn_ip_tcp_open(RpcConnection* Connection) @@ -271,7 +274,7 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_op return RPC_S_SERVER_UNAVAILABLE; } - if (tcpc->sock) + if (tcpc->sock != -1) return RPC_S_OK; sa.sin_family = AF_INET; @@ -335,9 +338,9 @@ static int rpcrt4_conn_tcp_close(RpcConn RpcConnection_tcp *tcpc = (RpcConnection_tcp *) Connection; TRACE("%d\n", tcpc->sock); - if (tcpc->sock) + if (tcpc->sock != -1) close(tcpc->sock); - tcpc->sock = 0; + tcpc->sock = -1; return 0; }

1 0

Alexandre Julliard : wpp: Fixed typo in long long constants handling.
by Alexandre Julliard April 21, 2006

April 21, 2006

Module: wine Branch: refs/heads/master Commit: 36fb66dc79096cd17498663e25b6f4996ffe08de URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=36fb66dc79096cd17498663… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 21 12:44:40 2006 +0200 wpp: Fixed typo in long long constants handling. --- libs/wpp/ppy.y | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index 54b3aa4..e5494fa 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -361,8 +361,8 @@ pp_expr : tSINT { $$.type = cv_sint; | tUINT { $$.type = cv_uint; $$.val.ui = $1; } | tSLONG { $$.type = cv_slong; $$.val.sl = $1; } | tULONG { $$.type = cv_ulong; $$.val.ul = $1; } - | tSLONGLONG { $$.type = cv_sll; $$.val.sl = $1; } - | tULONGLONG { $$.type = cv_ull; $$.val.ul = $1; } + | tSLONGLONG { $$.type = cv_sll; $$.val.sll = $1; } + | tULONGLONG { $$.type = cv_ull; $$.val.ull = $1; } | tDEFINED tIDENT { $$.type = cv_sint; $$.val.si = pplookup($2) != NULL; } | tDEFINED '(' tIDENT ')' { $$.type = cv_sint; $$.val.si = pplookup($3) != NULL; } | tIDENT { $$.type = cv_sint; $$.val.si = 0; }

1 0

Bill Medland : wpp: Implement long long constant parsing.
by Alexandre Julliard April 21, 2006

April 21, 2006

Module: wine Branch: refs/heads/master Commit: 9e73da7340947390d81f035abc70d37d31c029c0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9e73da7340947390d81f035… Author: Bill Medland <billmedland(a)mercuryspeed.com> Date: Thu Apr 20 15:32:00 2006 -0700 wpp: Implement long long constant parsing. --- libs/wpp/ppl.l | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 073a6ac..990fbb1 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -821,9 +821,24 @@ static int make_number(int radix, YYSTYP } if(is_ll) - pp_internal_error(__FILE__, __LINE__, "long long constants not implemented yet"); - - if(is_u && is_l) + { +/* Assume as in the declaration of wrc_ull_t and wrc_sll_t */ +#if defined(SIZEOF_LONGLONG) && SIZEOF_LONGLONG >= 8 + if (is_u) + { + val->ull = strtoull(str, NULL, radix); + return tULONGLONG; + } + else + { + val->sll = strtoll(str, NULL, radix); + return tSLONGLONG; + } +#else + pp_internal_error(__FILE__, __LINE__, "long long constants not supported on this platform"); +#endif + } + else if(is_u && is_l) { val->ulong = strtoul(str, NULL, radix); return tULONG;

1 0

Hans Leidekker : dnsapi: Add a couple of macros and prototypes.
by Alexandre Julliard April 21, 2006

April 21, 2006

Module: wine Branch: refs/heads/master Commit: 2dca5f959f2e942bcd56ec1ae8d298f798d556e8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2dca5f959f2e942bcd56ec1… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Apr 19 11:16:27 2006 +0200 dnsapi: Add a couple of macros and prototypes. --- include/windns.h | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/include/windns.h b/include/windns.h index f9b0ead..7697753 100644 --- a/include/windns.h +++ b/include/windns.h @@ -572,8 +572,40 @@ typedef struct _DnsRecordW } Data; } DNS_RECORDW, *PDNS_RECORDW; -DECL_WINELIB_TYPE_AW(DNS_RECORD) -DECL_WINELIB_TYPE_AW(PDNS_RECORD) +#if defined(__WINESRC__) || defined(UNICODE) +typedef DNS_RECORDW DNS_RECORD; +typedef PDNS_RECORDW PDNS_RECORD; +#else +typedef DNS_RECORDA DNS_RECORD; +typedef PDNS_RECORDA PDNS_RECORD; +#endif + +typedef struct _DnsRRSet +{ + PDNS_RECORD pFirstRR; + PDNS_RECORD pLastRR; +} DNS_RRSET, *PDNS_RRSET; + +#define DNS_RRSET_INIT( rrset ) \ +{ \ + PDNS_RRSET _prrset = &(rrset); \ + _prrset->pFirstRR = NULL; \ + _prrset->pLastRR = (PDNS_RECORD) &_prrset->pFirstRR; \ +} + +#define DNS_RRSET_ADD( rrset, pnewRR ) \ +{ \ + PDNS_RRSET _prrset = &(rrset); \ + PDNS_RECORD _prrnew = (pnewRR); \ + _prrset->pLastRR->pNext = _prrnew; \ + _prrset->pLastRR = _prrnew; \ +} + +#define DNS_RRSET_TERMINATE( rrset ) \ +{ \ + PDNS_RRSET _prrset = &(rrset); \ + _prrset->pLastRR->pNext = NULL; \ +} DNS_STATUS WINAPI DnsAcquireContextHandle_A(DWORD,PVOID,HANDLE*); DNS_STATUS WINAPI DnsAcquireContextHandle_W(DWORD,PVOID,HANDLE*); @@ -588,6 +620,12 @@ DNS_STATUS WINAPI DnsQuery_A(PCSTR,WORD, DNS_STATUS WINAPI DnsQuery_W(PCWSTR,WORD,DWORD,PIP4_ARRAY,PDNS_RECORDW*,PVOID*); DNS_STATUS WINAPI DnsQuery_UTF8(PCSTR,WORD,DWORD,PIP4_ARRAY,PDNS_RECORDA*,PVOID*); DNS_STATUS WINAPI DnsQueryConfig(DNS_CONFIG_TYPE,DWORD,PWSTR,PVOID,PVOID,PDWORD); +BOOL WINAPI DnsRecordCompare(PDNS_RECORD,PDNS_RECORD); +PDNS_RECORD WINAPI DnsRecordCopyEx(PDNS_RECORD,DNS_CHARSET,DNS_CHARSET); +void WINAPI DnsRecordListFree(PDNS_RECORD,DNS_FREE_TYPE); +BOOL WINAPI DnsRecordSetCompare(PDNS_RECORD,PDNS_RECORD,PDNS_RECORD*,PDNS_RECORD*); +PDNS_RECORD WINAPI DnsRecordSetCopyEx(PDNS_RECORD,DNS_CHARSET,DNS_CHARSET); +PDNS_RECORD WINAPI DnsRecordSetDetach(PDNS_RECORD); void WINAPI DnsReleaseContextHandle(HANDLE); DNS_STATUS WINAPI DnsReplaceRecordSetA(PDNS_RECORDA,DWORD,HANDLE,PIP4_ARRAY,PVOID); DNS_STATUS WINAPI DnsReplaceRecordSetW(PDNS_RECORDW,DWORD,HANDLE,PIP4_ARRAY,PVOID);

1 0

Ivan Gyurdiev : wined3d: Fix mipmap level count.
by Alexandre Julliard April 21, 2006

April 21, 2006

Module: wine Branch: refs/heads/master Commit: 1e8675281271ae6f6eb1bafa789be91919a8b6da URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1e8675281271ae6f6eb1baf… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Fri Apr 21 04:21:47 2006 -0400 wined3d: Fix mipmap level count. --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 12d759b..e337b8d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -811,7 +811,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Creat object->baseTexture.levels++; tmpW = Width; tmpH = Height; - while (tmpW > 1 && tmpH > 1) { + while (tmpW > 1 || tmpH > 1) { tmpW = max(1, tmpW >> 1); tmpH = max(1, tmpH >> 1); object->baseTexture.levels++; @@ -889,7 +889,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create tmpW = Width; tmpH = Height; tmpD = Depth; - while (tmpW > 1 && tmpH > 1 && tmpD > 1) { + while (tmpW > 1 || tmpH > 1 || tmpD > 1) { tmpW = max(1, tmpW >> 1); tmpH = max(1, tmpH >> 1); tmpD = max(1, tmpD >> 1);

1 0