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

Juan Lang : msi: Fix silly pointer error.
by Alexandre Julliard July 18, 2006

July 18, 2006

Module: wine Branch: refs/heads/master Commit: 9e7f182871b4e79d0a1092bf4f439ef5c3d885e9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9e7f182871b4e79d0a1092b… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Jul 17 10:12:10 2006 -0700 msi: Fix silly pointer error. --- dlls/msi/appsearch.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 98b9b06..bea0c29 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -957,13 +957,13 @@ UINT ACTION_AppSearch(MSIPACKAGE *packag if (rc == ERROR_SUCCESS) { rc = ACTION_AppSearchComponents(package, &value, &sig); - if (rc == ERROR_SUCCESS && !*value) + if (rc == ERROR_SUCCESS && !value) { rc = ACTION_AppSearchReg(package, &value, &sig); - if (rc == ERROR_SUCCESS && !*value) + if (rc == ERROR_SUCCESS && !value) { rc = ACTION_AppSearchIni(package, &value, &sig); - if (rc == ERROR_SUCCESS && !*value) + if (rc == ERROR_SUCCESS && !value) rc = ACTION_AppSearchDr(package, &value, &sig); } }

1 0

James Hawkins : msi: Update the feature components' states when a feature is selected.
by Alexandre Julliard July 18, 2006

July 18, 2006

Module: wine Branch: refs/heads/master Commit: 7745a831a13adc0c8f55911009c3b2b57b8fa754 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7745a831a13adc0c8f55911… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 17 15:17:38 2006 -0700 msi: Update the feature components' states when a feature is selected. --- dlls/msi/dialog.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 2bb931f..d8e7cf5 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1509,6 +1509,7 @@ static LRESULT msi_seltree_menu( HWND hwnd, HTREEITEM hItem ) { MSIFEATURE *feature; + ComponentList *cl; union { RECT rc; POINT pt[2]; @@ -1545,6 +1546,13 @@ msi_seltree_menu( HWND hwnd, HTREEITEM h /* update */ msi_seltree_sync_item_state( hwnd, feature, hItem ); + /* update the feature's components */ + LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) + { + cl->component->Action = feature->Action; + cl->component->ActionRequest = feature->ActionRequest; + } + return 0; }

1 0

Duane Clark : msvcrt: Add tests of file operations in ASCII mode.
by Alexandre Julliard July 18, 2006

July 18, 2006

Module: wine Branch: refs/heads/master Commit: f8e4d4ccee1686c6017114a14cd5aa2fa8306026 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f8e4d4ccee1686c6017114a… Author: Duane Clark <fpga(a)pacbell.net> Date: Mon Jul 17 16:06:06 2006 -0700 msvcrt: Add tests of file operations in ASCII mode. --- dlls/msvcrt/tests/file.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 1c0f155..925b748 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -132,6 +132,57 @@ static void test_fileops( void ) unlink ("fdopen.tst"); } +static void test_asciifileops( void ) +{ + static const char outbuffer[] = "0,1,2,3,4,5,6,7,8,9\r\n\r\nA,B,C,D,E\r\nX,Y,Z"; + char buffer[256]; + int fd; + FILE *file; + int i; + long l; + + fd = open ("fdopen.tst", O_WRONLY | O_CREAT | O_BINARY, _S_IREAD |_S_IWRITE); + write (fd, outbuffer, sizeof (outbuffer)); + close (fd); + + /* Open file in ascii mode */ + fd = open ("fdopen.tst", O_RDONLY); + file = fdopen (fd, "rb"); + ok(strlen(outbuffer) == (sizeof(outbuffer)-1),"strlen/sizeof error\n"); + ok(ftell(file) == 0,"Did not start at beginning of file\n"); + ok(fgets(buffer,sizeof(buffer),file) !=0,"line 1 fgets failed unexpected\n"); + ok(fgets(buffer,sizeof(buffer),file) !=0,"line 2 fgets failed unexpected\n"); + ok(fgets(buffer,sizeof(buffer),file) !=0,"line 3 fgets failed unexpected\n"); + ok(fgets(buffer,sizeof(buffer),file) !=0,"line 4 fgets failed unexpected\n"); + ok(fgets(buffer,sizeof(buffer),file) ==0,"fgets didn't signal EOF\n"); + ok(feof(file) !=0,"feof doesn't signal EOF\n"); + rewind(file); + ok(ftell(file) == 0,"Did not rewind to beginning of file\n"); + for (i=0; i<strlen(outbuffer); i++) + if (outbuffer[i] == '\n') break; + i++; + ok(fgets(buffer,strlen(outbuffer),file) !=0,"line 1 fgets failed unexpected\n"); + l = ftell(file); + todo_wine ok(l == i,"line 1 ftell got %ld should be %d\n", l, i); + ok(lstrlenA(buffer) == i-1,"line 1 fgets got size %d should be %d\n", lstrlenA(buffer), i-1); + ok(fgets(buffer,sizeof(outbuffer),file) !=0,"line 2 fgets failed unexpected\n"); + i += 2; + l = ftell(file); + todo_wine ok(l == i,"line 2 ftell got %ld should be %d\n", l, i); + ok(lstrlenA(buffer) == 1,"line 2 fgets got size %d should be %d\n", lstrlenA(buffer), 1); + ok(fgets(buffer,sizeof(outbuffer),file) !=0,"line 3 fgets failed unexpected\n"); + for (; i<strlen(outbuffer); i++) + if (outbuffer[i] == '\n') break; + i++; + l = ftell(file); + ok(l == i,"line 3 ftell got %ld should be %d\n", l, i); + + fclose (file); + + unlink ("fdopen.tst"); +} + + static WCHAR* AtoW( char* p ) { WCHAR* buffer; @@ -505,6 +556,7 @@ START_TEST(file) test_fdopen(); test_fopen_fclose_fcloseall(); test_fileops(); + test_asciifileops(); test_fgetwc(); test_file_put_get(); test_tmpnam();

1 0

Jacek Caban : urlmon: Fix handle leak.
by Alexandre Julliard July 18, 2006

July 18, 2006

Module: wine Branch: refs/heads/master Commit: d85110a31747b02a375cc339f2c7d2f83dcb6b82 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d85110a31747b02a375cc33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 17 21:22:27 2006 +0200 urlmon: Fix handle leak. --- dlls/urlmon/sec_mgr.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 1d02542..41a05b1 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -97,6 +97,7 @@ static HRESULT map_url_to_zone(LPCWSTR u size = sizeof(DWORD); res = RegQueryValueExW(hkey, schema, NULL, NULL, (PBYTE)zone, &size); + RegCloseKey(hkey); if(res == ERROR_SUCCESS) return S_OK; @@ -108,6 +109,7 @@ static HRESULT map_url_to_zone(LPCWSTR u size = sizeof(DWORD); res = RegQueryValueExW(hkey, schema, NULL, NULL, (PBYTE)zone, &size); + RegCloseKey(hkey); if(res == ERROR_SUCCESS) return S_OK;

1 0

Jacek Caban : mshtml: Wrap more Heap* function by inline functions.
by Alexandre Julliard July 18, 2006

July 18, 2006

Module: wine Branch: refs/heads/master Commit: a4cc5bf299f7b998e300aa08a8961355ec360c8c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a4cc5bf299f7b998e300aa0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 17 21:21:21 2006 +0200 mshtml: Wrap more Heap* function by inline functions. --- dlls/mshtml/htmlbody.c | 4 ++-- dlls/mshtml/htmldoc.c | 6 +++--- dlls/mshtml/htmlelem.c | 26 +++++++++++++------------- dlls/mshtml/htmlinput.c | 4 ++-- dlls/mshtml/htmlnode.c | 4 ++-- dlls/mshtml/htmlselect.c | 4 ++-- dlls/mshtml/htmltextarea.c | 4 ++-- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 0ad554e..b557906 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -385,7 +385,7 @@ static void HTMLBodyElement_destructor(I HTMLBodyElement *This = HTMLBODY_THIS(iface); nsIDOMHTMLBodyElement_Release(This->nsbody); - HeapFree(GetProcessHeap(), 0, This); + mshtml_free(This); } static const IHTMLBodyElementVtbl HTMLBodyElementVtbl = { @@ -435,7 +435,7 @@ static const IHTMLBodyElementVtbl HTMLBo void HTMLBodyElement_Create(HTMLElement *element) { - HTMLBodyElement *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(HTMLBodyElement)); + HTMLBodyElement *ret = mshtml_alloc(sizeof(HTMLBodyElement)); nsresult nsres; ret->lpHTMLBodyElementVtbl = &HTMLBodyElementVtbl; diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 2bf8522..e3c7e32 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -162,7 +162,7 @@ static ULONG WINAPI HTMLDocument_Release if(This->nscontainer) NSContainer_Release(This->nscontainer); - HeapFree(GetProcessHeap(), 0, This); + mshtml_free(This); UNLOCK_MODULE(); } @@ -1066,7 +1066,7 @@ HRESULT HTMLDocument_Create(IUnknown *pU TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppvObject); - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(HTMLDocument)); + ret = mshtml_alloc(sizeof(HTMLDocument)); ret->lpHTMLDocument2Vtbl = &HTMLDocumentVtbl; ret->ref = 0; ret->nscontainer = NULL; @@ -1074,7 +1074,7 @@ HRESULT HTMLDocument_Create(IUnknown *pU hres = IHTMLDocument_QueryInterface(HTMLDOC(ret), riid, ppvObject); if(FAILED(hres)) { - HeapFree(GetProcessHeap(), 0, ret); + mshtml_free(ret); return hres; } diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index c49555c..48a073a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -48,7 +48,7 @@ static void elem_vector_add(elem_vector { if(buf->len == buf->size) { buf->size <<= 1; - buf->buf = HeapReAlloc(GetProcessHeap(), 0, buf->buf, buf->size*sizeof(HTMLElement**)); + buf->buf = mshtml_realloc(buf->buf, buf->size*sizeof(HTMLElement**)); } buf->buf[buf->len++] = elem; @@ -158,7 +158,7 @@ static HRESULT WINAPI HTMLElement_getAtt if(NS_SUCCEEDED(nsres)) { nsAString_GetData(&value_str, &value, NULL); V_VT(AttributeValue) = VT_BSTR; - V_BSTR(AttributeValue) = SysAllocString(value);; + V_BSTR(AttributeValue) = SysAllocString(value); TRACE("attr_value=%s\n", debugstr_w(V_BSTR(AttributeValue))); }else { ERR("GetAttribute failed: %08lx\n", nsres); @@ -804,15 +804,15 @@ static HRESULT WINAPI HTMLElement_get_al TRACE("(%p)->(%p)\n", This, p); - buf.buf = HeapAlloc(GetProcessHeap(), 0, buf.size*sizeof(HTMLElement**)); + buf.buf = mshtml_alloc(buf.size*sizeof(HTMLElement**)); create_all_list(This->node->doc, This, &buf); if(!buf.len) { - HeapFree(GetProcessHeap(), 0, buf.buf); + mshtml_free(buf.buf); buf.buf = NULL; }else if(buf.size > buf.len) { - buf.buf = HeapReAlloc(GetProcessHeap(), 0, buf.buf, buf.len*sizeof(HTMLElement**)); + buf.buf = mshtml_realloc(buf.buf, buf.len*sizeof(HTMLElement**)); } return HTMLElementCollection_Create((IUnknown*)HTMLELEM(This), buf.buf, buf.len, p); @@ -828,7 +828,7 @@ static void HTMLElement_destructor(IUnkn if(This->nselem) nsIDOMHTMLElement_Release(This->nselem); - HeapFree(GetProcessHeap(), 0, This); + mshtml_free(This); } #undef HTMLELEM_THIS @@ -968,7 +968,7 @@ void HTMLElement_Create(HTMLDOMNode *nod static const WCHAR wszSELECT[] = {'S','E','L','E','C','T',0}; static const WCHAR wszTEXTAREA[] = {'T','E','X','T','A','R','E','A',0}; - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(HTMLElement)); + ret = mshtml_alloc(sizeof(HTMLElement)); ret->lpHTMLElementVtbl = &HTMLElementVtbl; ret->node = node; ret->impl = NULL; @@ -1061,8 +1061,8 @@ static ULONG WINAPI HTMLElementCollectio if(!ref) { IUnknown_Release(This->ref_unk); - HeapFree(GetProcessHeap(), 0, This->elems); - HeapFree(GetProcessHeap(), 0, This); + mshtml_free(This->elems); + mshtml_free(This); } return ref; @@ -1177,7 +1177,7 @@ static HRESULT WINAPI HTMLElementCollect TRACE("(%p)->(%s %p)\n", This, debugstr_w(V_BSTR(&tagName)), pdisp); - buf.buf = HeapAlloc(GetProcessHeap(), 0, buf.size*sizeof(HTMLElement*)); + buf.buf = mshtml_alloc(buf.size*sizeof(HTMLElement*)); nsAString_Init(&tag_str, NULL); @@ -1198,10 +1198,10 @@ static HRESULT WINAPI HTMLElementCollect TRACE("fount %ld tags\n", buf.len); if(!buf.len) { - HeapFree(GetProcessHeap(), 0, buf.buf); + mshtml_free(buf.buf); buf.buf = NULL; }else if(buf.size > buf.len) { - buf.buf = HeapReAlloc(GetProcessHeap(), 0, buf.buf, buf.len); + buf.buf = mshtml_realloc(buf.buf, buf.len*sizeof(HTMLElement*)); } return HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len, pdisp); @@ -1228,7 +1228,7 @@ static const IHTMLElementCollectionVtbl static HRESULT HTMLElementCollection_Create(IUnknown *ref_unk, HTMLElement **elems, DWORD len, IDispatch **p) { - HTMLElementCollection *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(HTMLElementCollection)); + HTMLElementCollection *ret = mshtml_alloc(sizeof(HTMLElementCollection)); ret->lpHTMLElementCollectionVtbl = &HTMLElementCollectionVtbl; ret->ref = 1; diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 1b1f6d5..531288a 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -657,7 +657,7 @@ static void HTMLInputElement_destructor( HTMLInputElement *This = HTMLINPUT_THIS(iface); nsIDOMHTMLInputElement_Release(This->nsinput); - HeapFree(GetProcessHeap(), 0, This); + mshtml_free(This); } #undef HTMLINPUT_THIS @@ -739,7 +739,7 @@ static const IHTMLInputElementVtbl HTMLI void HTMLInputElement_Create(HTMLElement *element) { - HTMLInputElement *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(HTMLInputElement)); + HTMLInputElement *ret = mshtml_alloc(sizeof(HTMLInputElement)); nsresult nsres; ret->lpHTMLInputElementVtbl = &HTMLInputElementVtbl; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 6e16454..513d99b 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -333,7 +333,7 @@ HTMLDOMNode *get_node(HTMLDocument *This if(iter) return iter; - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(HTMLDOMNode)); + ret = mshtml_alloc(sizeof(HTMLDOMNode)); ret->lpHTMLDOMNodeVtbl = &HTMLDOMNodeVtbl; ret->node_type = NT_UNKNOWN; ret->impl.unk = NULL; @@ -367,6 +367,6 @@ void release_nodes(HTMLDocument *This) if(iter->destructor) iter->destructor(iter->impl.unk); nsIDOMNode_Release(iter->nsnode); - HeapFree(GetProcessHeap(), 0, iter); + mshtml_free(iter); } } diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 639e26f..607cc41 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -342,7 +342,7 @@ static void HTMLSelectElement_destructor HTMLSelectElement *This = HTMLSELECT_THIS(iface); nsIDOMHTMLSelectElement_Release(This->nsselect); - HeapFree(GetProcessHeap(), 0, This); + mshtml_free(This); } static const IHTMLSelectElementVtbl HTMLSelectElementVtbl = { @@ -381,7 +381,7 @@ static const IHTMLSelectElementVtbl HTML void HTMLSelectElement_Create(HTMLElement *element) { - HTMLSelectElement *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(HTMLSelectElement)); + HTMLSelectElement *ret = mshtml_alloc(sizeof(HTMLSelectElement)); nsresult nsres; ret->lpHTMLSelectElementVtbl = &HTMLSelectElementVtbl; diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 1bc8ecc..26d1061 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -354,7 +354,7 @@ static void HTMLTextAreaElement_destruct HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface); nsIDOMHTMLTextAreaElement_Release(This->nstextarea); - HeapFree(GetProcessHeap(), 0, This); + mshtml_free(This); } #undef HTMLTXTAREA_THIS @@ -397,7 +397,7 @@ static const IHTMLTextAreaElementVtbl HT void HTMLTextAreaElement_Create(HTMLElement *element) { - HTMLTextAreaElement *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(HTMLTextAreaElement)); + HTMLTextAreaElement *ret = mshtml_alloc(sizeof(HTMLTextAreaElement)); nsresult nsres; ret->lpHTMLTextAreaElementVtbl = &HTMLTextAreaElementVtbl;

1 0

Robert Shearman : oleaut32: Add an exception handler around code executed on the server side from the typelib marshaler .
by Alexandre Julliard July 18, 2006

July 18, 2006

Module: wine Branch: refs/heads/master Commit: a05672e55f64641603ad562df5773f73f18f4f63 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a05672e55f64641603ad562… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 17 20:19:27 2006 +0100 oleaut32: Add an exception handler around code executed on the server side from the typelib marshaler. --- dlls/oleaut32/tmarshal.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 2dee9d7..396cca3 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -40,12 +40,14 @@ #include "winbase.h" #include "winnls.h" #include "winreg.h" #include "winuser.h" +#include "excpt.h" #include "ole2.h" #include "propidl.h" /* for LPSAFEARRAY_User* functions */ #include "typelib.h" #include "variant.h" #include "wine/debug.h" +#include "wine/exception.h" static const WCHAR IDispatchW[] = { 'I','D','i','s','p','a','t','c','h',0}; @@ -1785,12 +1787,30 @@ TMStubImpl_Invoke( } args[0] = (DWORD)This->pUnk; - res = _invoke( - (*((FARPROC**)args[0]))[fdesc->oVft/4], - fdesc->callconv, - (xargs-args), - args - ); + + __TRY + { + res = _invoke( + (*((FARPROC**)args[0]))[fdesc->oVft/4], + fdesc->callconv, + (xargs-args), + args + ); + } + __EXCEPT(NULL) + { + DWORD dwExceptionCode = GetExceptionCode(); + ERR("invoke call failed with exception 0x%08lx (%ld)\n", dwExceptionCode, dwExceptionCode); + if (FAILED(dwExceptionCode)) + hres = dwExceptionCode; + else + hres = HRESULT_FROM_WIN32(dwExceptionCode); + } + __ENDTRY + + if (hres != S_OK) + return hres; + buf.curoff = 0; xargs = args+1;

1 0

Robert Shearman : msi: Fix conversion of path to include nul-termination character in MsiProvideQualifiedComponentA .
by Alexandre Julliard July 18, 2006

July 18, 2006

Module: wine Branch: refs/heads/master Commit: aea12b46953d7a42e911b11fde1eaba7c3365874 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aea12b46953d7a42e911b11… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 17 20:19:19 2006 +0100 msi: Fix conversion of path to include nul-termination character in MsiProvideQualifiedComponentA. --- dlls/msi/msi.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 241287c..a488b12 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1617,7 +1617,7 @@ UINT WINAPI MsiProvideQualifiedComponent DWORD* pcchPathBuf) { LPWSTR szwComponent, szwQualifier, lpwPathBuf; - DWORD pcchwPathBuf; + DWORD cchwPathBuf; UINT rc; TRACE("%s %s %li %p %p\n",szComponent, szQualifier, @@ -1628,16 +1628,16 @@ UINT WINAPI MsiProvideQualifiedComponent lpwPathBuf = msi_alloc(*pcchPathBuf * sizeof(WCHAR)); - pcchwPathBuf = *pcchPathBuf; + cchwPathBuf = *pcchPathBuf; rc = MsiProvideQualifiedComponentW(szwComponent, szwQualifier, - dwInstallMode, lpwPathBuf, &pcchwPathBuf); + dwInstallMode, lpwPathBuf, &cchwPathBuf); msi_free(szwComponent); msi_free(szwQualifier); if (rc == ERROR_SUCCESS) - *pcchPathBuf = WideCharToMultiByte(CP_ACP, 0, lpwPathBuf, pcchwPathBuf, + *pcchPathBuf = WideCharToMultiByte(CP_ACP, 0, lpwPathBuf, cchwPathBuf + 1, lpPathBuf, *pcchPathBuf, NULL, NULL); msi_free(lpwPathBuf);

1 0

Robert Shearman : rpcrt4: Display a big message box if the user tries to use typelib
by Alexandre Julliard July 18, 2006

July 18, 2006

Module: wine Branch: refs/heads/master Commit: d2cb9ec567ea1f19d9c42c50ddc3a01491006b6c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d2cb9ec567ea1f19d9c42c5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 17 20:19:38 2006 +0100 rpcrt4: Display a big message box if the user tries to use typelib marshaling in native oleaut32 with builtin rpcrt4 to tell them what is wrong. --- dlls/rpcrt4/cproxy.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index f022ed3..88910a3 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -344,6 +344,19 @@ HRESULT WINAPI CreateProxyFromTypeInfo( LPTYPEINFO pTypeInfo, LPUNKNOWN pUnkOuter, REFIID riid, LPRPCPROXYBUFFER *ppProxy, LPVOID *ppv ) { + typedef INT (WINAPI *MessageBoxA)(HWND,LPCSTR,LPCSTR,UINT); + HMODULE hUser32 = LoadLibraryA("user32"); + MessageBoxA pMessageBoxA = GetProcAddress(hUser32, "MessageBoxA"); + FIXME("%p %p %s %p %p\n", pTypeInfo, pUnkOuter, debugstr_guid(riid), ppProxy, ppv); + if (pMessageBoxA) + { + pMessageBoxA(NULL, + "The native implementation of OLEAUT32.DLL cannot be used " + "with Wine's RPCRT4.DLL. Remove OLEAUT32.DLL and try again.\n", + "Wine: Unimplemented CreateProxyFromTypeInfo", + 0x10); + ExitProcess(1); + } return E_NOTIMPL; }

1 0

Robert Shearman : rpcrt4: Handle more structure padding values.
by Alexandre Julliard July 18, 2006

July 18, 2006

Module: wine Branch: refs/heads/master Commit: 9318cb0fbc09eb29b303794e5686dcea95e00e03 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9318cb0fbc09eb29b303794… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 17 20:19:14 2006 +0100 rpcrt4: Handle more structure padding values. --- dlls/rpcrt4/ndr_marshall.c | 40 +++++++++++++++++++++++++++++++++++----- include/wine/rpcfc.h | 6 ++++++ 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index b6ff54d..e1adfa0 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1734,8 +1734,14 @@ static unsigned char * ComplexMarshall(P case RPC_FC_ALIGNM8: ALIGN_POINTER(pMemory, 8); break; + case RPC_FC_STRUCTPAD1: case RPC_FC_STRUCTPAD2: - pMemory += 2; + case RPC_FC_STRUCTPAD3: + case RPC_FC_STRUCTPAD4: + case RPC_FC_STRUCTPAD5: + case RPC_FC_STRUCTPAD6: + case RPC_FC_STRUCTPAD7: + pMemory += *pFormat - RPC_FC_STRUCTPAD1 + 1; break; case RPC_FC_EMBEDDED_COMPLEX: pMemory += pFormat[1]; @@ -1808,8 +1814,14 @@ static unsigned char * ComplexUnmarshall case RPC_FC_ALIGNM8: ALIGN_POINTER(pMemory, 8); break; + case RPC_FC_STRUCTPAD1: case RPC_FC_STRUCTPAD2: - pMemory += 2; + case RPC_FC_STRUCTPAD3: + case RPC_FC_STRUCTPAD4: + case RPC_FC_STRUCTPAD5: + case RPC_FC_STRUCTPAD6: + case RPC_FC_STRUCTPAD7: + pMemory += *pFormat - RPC_FC_STRUCTPAD1 + 1; break; case RPC_FC_EMBEDDED_COMPLEX: pMemory += pFormat[1]; @@ -1876,8 +1888,14 @@ static unsigned char * ComplexBufferSize case RPC_FC_ALIGNM8: ALIGN_POINTER(pMemory, 8); break; + case RPC_FC_STRUCTPAD1: case RPC_FC_STRUCTPAD2: - pMemory += 2; + case RPC_FC_STRUCTPAD3: + case RPC_FC_STRUCTPAD4: + case RPC_FC_STRUCTPAD5: + case RPC_FC_STRUCTPAD6: + case RPC_FC_STRUCTPAD7: + pMemory += *pFormat - RPC_FC_STRUCTPAD1 + 1; break; case RPC_FC_EMBEDDED_COMPLEX: pMemory += pFormat[1]; @@ -1939,8 +1957,14 @@ static unsigned char * ComplexFree(PMIDL case RPC_FC_ALIGNM8: ALIGN_POINTER(pMemory, 8); break; + case RPC_FC_STRUCTPAD1: case RPC_FC_STRUCTPAD2: - pMemory += 2; + case RPC_FC_STRUCTPAD3: + case RPC_FC_STRUCTPAD4: + case RPC_FC_STRUCTPAD5: + case RPC_FC_STRUCTPAD6: + case RPC_FC_STRUCTPAD7: + pMemory += *pFormat - RPC_FC_STRUCTPAD1 + 1; break; case RPC_FC_EMBEDDED_COMPLEX: pMemory += pFormat[1]; @@ -2003,8 +2027,14 @@ static unsigned long ComplexStructMemory ALIGN_LENGTH(size, 8); ALIGN_POINTER(pStubMsg->Buffer, 8); break; + case RPC_FC_STRUCTPAD1: case RPC_FC_STRUCTPAD2: - size += 2; + case RPC_FC_STRUCTPAD3: + case RPC_FC_STRUCTPAD4: + case RPC_FC_STRUCTPAD5: + case RPC_FC_STRUCTPAD6: + case RPC_FC_STRUCTPAD7: + size += *pFormat - RPC_FC_STRUCTPAD1 + 1; break; case RPC_FC_EMBEDDED_COMPLEX: size += pFormat[1]; diff --git a/include/wine/rpcfc.h b/include/wine/rpcfc.h index 9e1003c..fb479dd 100644 --- a/include/wine/rpcfc.h +++ b/include/wine/rpcfc.h @@ -88,7 +88,13 @@ #define RPC_FC_POINTER 0x36 #define RPC_FC_ALIGNM4 0x38 #define RPC_FC_ALIGNM8 0x39 +#define RPC_FC_STRUCTPAD1 0x3d #define RPC_FC_STRUCTPAD2 0x3e +#define RPC_FC_STRUCTPAD3 0x3f +#define RPC_FC_STRUCTPAD4 0x40 +#define RPC_FC_STRUCTPAD5 0x41 +#define RPC_FC_STRUCTPAD6 0x42 +#define RPC_FC_STRUCTPAD7 0x43 #define RPC_FC_STRING_SIZED 0x44

1 0

Christian Costa : wined3d: Readd missing copyright to shaders files.
by Alexandre Julliard July 18, 2006

July 18, 2006

Module: wine Branch: refs/heads/master Commit: 2dc451e18192ea15c6ffa1375576468e108c63ee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2dc451e18192ea15c6ffa13… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Jul 17 20:35:14 2006 +0200 wined3d: Readd missing copyright to shaders files. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/baseshader.c | 1 + dlls/wined3d/pixelshader.c | 1 + dlls/wined3d/surface.c | 1 - dlls/wined3d/vertexshader.c | 1 + 5 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f3046f8..ba95de3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4,6 +4,7 @@ * * Copyright 2002-2003 Jason Edmeades * Copyright 2002-2003 Raphael Junqueira + * Copyright 2004 Christian Costa * Copyright 2005 Oliver Stieber * Copyright 2006 Ivan Gyurdiev * Copyright 2006 Jason Green diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 7595bc9..120123d 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -3,6 +3,7 @@ * * Copyright 2002-2003 Jason Edmeades * Copyright 2002-2003 Raphael Junqueira + * Copyright 2004 Christian Costa * Copyright 2005 Oliver Stieber * Copyright 2006 Ivan Gyurdiev * diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 498380b..8f4b273 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -3,6 +3,7 @@ * * Copyright 2002-2003 Jason Edmeades * Copyright 2002-2003 Raphael Junqueira + * Copyright 2004 Christian Costa * Copyright 2005 Oliver Stieber * Copyright 2006 Ivan Gyurdiev * diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b682096..bf2ac87 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1098,7 +1098,6 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC b_info->bmiHeader.biPlanes = 1; b_info->bmiHeader.biBitCount = This->bytesPerPixel * 8; - b_info->bmiHeader.biXPelsPerMeter = 0; b_info->bmiHeader.biYPelsPerMeter = 0; b_info->bmiHeader.biClrUsed = 0; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 54b8520..2cd98c0 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -3,6 +3,7 @@ * * Copyright 2002-2003 Jason Edmeades * Copyright 2002-2003 Raphael Junqueira + * Copyright 2004 Christian Costa * Copyright 2005 Oliver Stieber * Copyright 2006 Ivan Gyurdiev *

1 0