February 2008 - Wine-commits

Alexandre Julliard : winex11: Force the client dimensions to at least 1x1 in sync_gl_drawable.
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: f13ef6b898cd79682a05cf8239fcfc886049e2e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13ef6b898cd79682a05cf823… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 22 16:30:10 2008 +0100 winex11: Force the client dimensions to at least 1x1 in sync_gl_drawable. --- dlls/winex11.drv/window.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4a41ba5..9939d7e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -486,6 +486,9 @@ static void sync_gl_drawable(Display *display, struct x11drv_win_data *data) Drawable glxp; Pixmap pix; + if (w <= 0) w = 1; + if (h <= 0) h = 1; + TRACE("Resizing GL drawable 0x%lx to %dx%d\n", data->gl_drawable, w, h); #ifdef SONAME_LIBXCOMPOSITE if(usexcomposite)

1 0

Alistair Leslie-Hughes : slc: Added stub for SLGetWindowsInformationDWORD.
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: 40953c2ada49f2b8df62624f273c54b128610630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40953c2ada49f2b8df62624f2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 21 20:18:50 2008 +1100 slc: Added stub for SLGetWindowsInformationDWORD. --- dlls/slc/Makefile.in | 1 + dlls/slc/slc.c | 9 +++++++++ dlls/slc/slc.spec | 2 +- include/Makefile.in | 2 ++ include/slerror.h | 25 +++++++++++++++++++++++++ include/slpublic.h | 39 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 77 insertions(+), 1 deletions(-) diff --git a/dlls/slc/Makefile.in b/dlls/slc/Makefile.in index 2097ca2..20fec6f 100644 --- a/dlls/slc/Makefile.in +++ b/dlls/slc/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_SLC_ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c index 40c5287..e7416f1 100644 --- a/dlls/slc/slc.c +++ b/dlls/slc/slc.c @@ -23,8 +23,17 @@ #include "winbase.h" #include "wine/debug.h" +#include "slpublic.h" +#include "slerror.h" + WINE_DEFAULT_DEBUG_CHANNEL(slc); +DWORD WINAPI SLGetWindowsInformationDWORD(LPCWSTR lpszValueName, LPDWORD pdwValue) +{ + FIXME("(%s) stub\n", debugstr_w(lpszValueName) ); + + return SL_E_RIGHT_NOT_GRANTED; +} /*********************************************************************** * DllMain (CLUSAPI.@) diff --git a/dlls/slc/slc.spec b/dlls/slc/slc.spec index e946247..45cd1ba 100644 --- a/dlls/slc/slc.spec +++ b/dlls/slc/slc.spec @@ -26,7 +26,7 @@ @ stub SLGetSLIDList @ stub SLGetServiceInformation @ stub SLGetWindowsInformation -@ stub SLGetWindowsInformationDWORD +@ stdcall SLGetWindowsInformationDWORD(wstr ptr) @ stub SLInstallLicense @ stub SLInstallProofOfPurchase @ stub SLInstallSAMLicense diff --git a/include/Makefile.in b/include/Makefile.in index d3731a5..1acd285 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -359,6 +359,8 @@ SRCDIR_INCLUDES = \ shlobj.h \ shlwapi.h \ sipbase.h \ + slerror.h \ + slpublic.h \ snmp.h \ softpub.h \ sql.h \ diff --git a/include/slerror.h b/include/slerror.h new file mode 100644 index 0000000..9c800f6 --- /dev/null +++ b/include/slerror.h @@ -0,0 +1,25 @@ +/* + * + * Copyright 2008 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __WINE_SLERROR_H +#define __WINE_SLERROR_H + +#define SL_E_RIGHT_NOT_GRANTED 0xC004F013 +#define SL_E_DATATYPE_MISMATCHED 0xC004F01E + +#endif /* __WINE_SLERROR_H */ diff --git a/include/slpublic.h b/include/slpublic.h new file mode 100644 index 0000000..a2c6d42 --- /dev/null +++ b/include/slpublic.h @@ -0,0 +1,39 @@ +/* + * + * Copyright 2008 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __WINE_SLPUBLIC_H +#define __WINE_SLPUBLIC_H + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef _SLC_ +#define SLCAPI +#else +#define SLCAPI DECLSPEC_IMPORT +#endif + +SLCAPI DWORD WINAPI SLGetWindowsInformationDWORD(LPCWSTR lpszValueName, LPDWORD pdwValue); + + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_SLPUBLIC_H */

1 0

Jacek Caban : urlmon: 0x800c0008 is INET_E_DOWNLOAD_FAILURE.
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: be1e2080b3f5b95f2e48b65d34cc83830012b33b URL: http://source.winehq.org/git/wine.git/?a=commit;h=be1e2080b3f5b95f2e48b65d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 22 02:09:27 2008 +0100 urlmon: 0x800c0008 is INET_E_DOWNLOAD_FAILURE. --- dlls/urlmon/binding.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 6bd2946..c647230 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1662,7 +1662,7 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, I hres = IBindStatusCallback_OnStartBinding(binding->callback, 0, BINDING(binding)); if(FAILED(hres)) { WARN("OnStartBinding failed: %08x\n", hres); - stop_binding(binding, 0x800c0008, NULL); + stop_binding(binding, INET_E_DOWNLOAD_FAILURE, NULL); IBinding_Release(BINDING(binding)); return hres; }

1 0

Jacek Caban : browseui: Code clean up.
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: 04ba306690e7b5f9bb1ece982aec612e5af158f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ba306690e7b5f9bb1ece982… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 22 02:22:59 2008 +0100 browseui: Code clean up. --- dlls/browseui/aclmulti.c | 4 +- dlls/browseui/browseui.h | 5 +++ dlls/browseui/browseui_main.c | 27 ++++++++--------- dlls/browseui/compcatcachedaemon.c | 44 +++++++++++++--------------- dlls/browseui/progressdlg.c | 56 +++++++++++++++++------------------ 5 files changed, 68 insertions(+), 68 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index 95ede34..c7daba0 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -310,10 +310,10 @@ HRESULT ACLMulti_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (pUnkOuter) return CLASS_E_NOAGGREGATION; - This = heap_alloc(sizeof(ACLMulti)); + This = heap_alloc_zero(sizeof(ACLMulti)); if (This == NULL) return E_OUTOFMEMORY; - ZeroMemory(This, sizeof(*This)); + This->vtbl = &ACLMultiVtbl; This->aclVtbl = &ACLMulti_ACListVtbl; This->objmgrVtbl = &ACLMulti_ObjMgrVtbl; diff --git a/dlls/browseui/browseui.h b/dlls/browseui/browseui.h index 0b62009..2808647 100644 --- a/dlls/browseui/browseui.h +++ b/dlls/browseui/browseui.h @@ -35,6 +35,11 @@ static inline void *heap_alloc(size_t size) return HeapAlloc(GetProcessHeap(), 0, size); } +static inline void *heap_alloc_zero(size_t size) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); +} + static inline void *heap_realloc(void *mem, size_t size) { return mem ? HeapReAlloc(GetProcessHeap(), 0, mem, size) : heap_alloc(size); diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index c370408..dda6c3c 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -64,24 +64,11 @@ typedef struct tagClassFactory LONG ref; LPFNCONSTRUCTOR ctor; } ClassFactory; -static const IClassFactoryVtbl ClassFactoryVtbl; - -static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) -{ - ClassFactory *This = CoTaskMemAlloc(sizeof(ClassFactory)); - This->vtbl = &ClassFactoryVtbl; - This->ref = 1; - This->ctor = ctor; - *ppvOut = (LPVOID)This; - TRACE("Created class factory %p\n", This); - BROWSEUI_refCount++; - return S_OK; -} static void ClassFactory_Destructor(ClassFactory *This) { TRACE("Destroying class factory %p\n", This); - CoTaskMemFree(This); + heap_free(This); BROWSEUI_refCount--; } @@ -154,6 +141,18 @@ static const IClassFactoryVtbl ClassFactoryVtbl = { ClassFactory_LockServer }; +static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) +{ + ClassFactory *This = heap_alloc(sizeof(ClassFactory)); + This->vtbl = &ClassFactoryVtbl; + This->ref = 1; + This->ctor = ctor; + *ppvOut = (LPVOID)This; + TRACE("Created class factory %p\n", This); + BROWSEUI_refCount++; + return S_OK; +} + /************************************************************************* * BROWSEUI DllMain */ diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index f4fd5e6..2cf15e4 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -49,33 +49,11 @@ typedef struct tagCCCD { CRITICAL_SECTION cs; } CompCatCacheDaemon; -static const IRunnableTaskVtbl CompCatCacheDaemonVtbl; - -HRESULT CompCatCacheDaemon_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) -{ - CompCatCacheDaemon *This; - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - - This = CoTaskMemAlloc(sizeof(CompCatCacheDaemon)); - if (This == NULL) - return E_OUTOFMEMORY; - ZeroMemory(This, sizeof(*This)); - This->vtbl = &CompCatCacheDaemonVtbl; - This->refCount = 1; - InitializeCriticalSection(&This->cs); - - TRACE("returning %p\n", This); - *ppOut = (IUnknown *)This; - BROWSEUI_refCount++; - return S_OK; -} - static void CompCatCacheDaemon_Destructor(CompCatCacheDaemon *This) { TRACE("destroying %p\n", This); DeleteCriticalSection(&This->cs); - CoTaskMemFree(This); + heap_free(This); BROWSEUI_refCount--; } @@ -157,3 +135,23 @@ static const IRunnableTaskVtbl CompCatCacheDaemonVtbl = CompCatCacheDaemon_Resume, CompCatCacheDaemon_IsRunning }; + +HRESULT CompCatCacheDaemon_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +{ + CompCatCacheDaemon *This; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + This = heap_alloc(sizeof(CompCatCacheDaemon)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->vtbl = &CompCatCacheDaemonVtbl; + This->refCount = 1; + InitializeCriticalSection(&This->cs); + + TRACE("returning %p\n", This); + *ppOut = (IUnknown *)This; + BROWSEUI_refCount++; + return S_OK; +} diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index a0444fd..c5465a3 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -74,8 +74,6 @@ typedef struct tagProgressDialog { HWND hwndDisabledParent; /* For modal dialog: the parent that need to be re-enabled when the dialog ends */ } ProgressDialog; -static const IProgressDialogVtbl ProgressDialogVtbl; - static void set_buffer(LPWSTR *buffer, LPCWSTR string) { static const WCHAR empty_string[] = {0}; @@ -246,37 +244,17 @@ static DWORD WINAPI dialog_thread(LPVOID lpParameter) return 0; } -HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) -{ - ProgressDialog *This; - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - - This = CoTaskMemAlloc(sizeof(ProgressDialog)); - if (This == NULL) - return E_OUTOFMEMORY; - ZeroMemory(This, sizeof(*This)); - This->vtbl = &ProgressDialogVtbl; - This->refCount = 1; - InitializeCriticalSection(&This->cs); - - TRACE("returning %p\n", This); - *ppOut = (IUnknown *)This; - BROWSEUI_refCount++; - return S_OK; -} - -static void WINAPI ProgressDialog_Destructor(ProgressDialog *This) +static void ProgressDialog_Destructor(ProgressDialog *This) { TRACE("destroying %p\n", This); if (This->hwnd) end_dialog(This); - CoTaskMemFree(This->lines[0]); - CoTaskMemFree(This->lines[1]); - CoTaskMemFree(This->lines[2]); - CoTaskMemFree(This->cancelMsg); - CoTaskMemFree(This->title); - CoTaskMemFree(This); + heap_free(This->lines[0]); + heap_free(This->lines[1]); + heap_free(This->lines[2]); + heap_free(This->cancelMsg); + heap_free(This->title); + heap_free(This); BROWSEUI_refCount--; } @@ -504,3 +482,23 @@ static const IProgressDialogVtbl ProgressDialogVtbl = ProgressDialog_SetCancelMsg, ProgressDialog_Timer }; + +HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +{ + ProgressDialog *This; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + This = heap_alloc_zero(sizeof(ProgressDialog)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->vtbl = &ProgressDialogVtbl; + This->refCount = 1; + InitializeCriticalSection(&This->cs); + + TRACE("returning %p\n", This); + *ppOut = (IUnknown *)This; + BROWSEUI_refCount++; + return S_OK; +}

1 0

James Hawkins : msi: Fix the size of the data sent in to RegSetValueExW.
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: 88c7c2c7a1552c5e92b59b856c20474ab3fb4933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88c7c2c7a1552c5e92b59b856… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Feb 21 21:47:13 2008 -0600 msi: Fix the size of the data sent in to RegSetValueExW. --- dlls/msi/source.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 44ab0c1..c373df2 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -563,6 +563,7 @@ static UINT set_last_used_source(HKEY source, LPCWSTR product, LPCWSTR usersid, sprintfW(buffer, format, typechar, index, value); + size = (lstrlenW(buffer) + 1) * sizeof(WCHAR); r = RegSetValueExW(source, INSTALLPROPERTY_LASTUSEDSOURCEW, 0, REG_SZ, (LPBYTE)buffer, size); msi_free(buffer);

1 0

Jacek Caban : urlmon: Correctly handle creating object failure.
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: f7371871dfd69920727e7a7267b137b9c2f08b8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7371871dfd69920727e7a726… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 22 02:09:12 2008 +0100 urlmon: Correctly handle creating object failure. --- dlls/urlmon/binding.c | 57 +++++++++++++++++++++++++++++------------------- 1 files changed, 34 insertions(+), 23 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index a966f2e..6bd2946 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -420,31 +420,17 @@ static void load_doc_mon(Binding *binding, IPersistMoniker *persist) FIXME("Load failed: %08x\n", hres); } -static void create_object(Binding *binding) +static HRESULT create_mime_object(Binding *binding, const CLSID *clsid, LPCWSTR clsid_str) { IPersistMoniker *persist; - LPWSTR clsid_str; - CLSID clsid; HRESULT hres; - if(!binding->mime) { - FIXME("MIME unavailable\n"); - return; - } - - if(!(clsid_str = get_mime_clsid(binding->mime, &clsid))) { - FIXME("Could not find object for MIME %s\n", debugstr_w(binding->mime)); - return; - } - - IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_CLASSIDAVAILABLE, clsid_str); - - IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_BEGINSYNCOPERATION, NULL); - - hres = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + hres = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &binding->iid, (void**)&binding->obj); - if(FAILED(hres)) - FIXME("CoCreateInstance failed: %08x\n", hres); + if(FAILED(hres)) { + WARN("CoCreateInstance failed: %08x\n", hres); + return INET_E_CANNOT_INSTANTIATE_OBJECT; + } binding->state |= BINDING_OBJAVAIL; @@ -467,13 +453,38 @@ static void create_object(Binding *binding) /* FIXME: Try query IPersistFile */ } - heap_free(clsid_str); - IBindStatusCallback_OnObjectAvailable(binding->callback, &binding->iid, binding->obj); + return S_OK; +} + +static void create_object(Binding *binding) +{ + LPWSTR clsid_str; + CLSID clsid; + HRESULT hres; + + if(!binding->mime) { + FIXME("MIME not available\n"); + return; + } + + if(!(clsid_str = get_mime_clsid(binding->mime, &clsid))) { + FIXME("Could not find object for MIME %s\n", debugstr_w(binding->mime)); + return; + } + + IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_CLASSIDAVAILABLE, clsid_str); + IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_BEGINSYNCOPERATION, NULL); + + hres = create_mime_object(binding, &clsid, clsid_str); + heap_free(clsid_str); + IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_ENDSYNCOPERATION, NULL); - stop_binding(binding, S_OK, NULL); + stop_binding(binding, hres, NULL); + if(FAILED(hres)) + IInternetProtocol_Terminate(binding->protocol, 0); } #define STGMEDUNK_THIS(iface) DEFINE_THIS(stgmed_buf_t, Unknown, iface)

1 0

Dan Hipschman : widl: Allow is_string_type to work for typedef'd types.
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: 2d7b1f18b16759a820589c6cf21d64ee19a63da5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7b1f18b16759a820589c6cf… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Feb 21 15:46:51 2008 -0800 widl: Allow is_string_type to work for typedef'd types. --- dlls/rpcrt4/tests/server.c | 22 ++++++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 13 +++++++++++++ tools/widl/header.h | 3 ++- tools/widl/typegen.c | 9 ++++++++- 4 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 43c3ec2..e06e57a 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -93,6 +93,12 @@ s_str_length(const char *s) } int +s_str_t_length(str_t s) +{ + return strlen(s); +} + +int s_cstr_length(const char *s, int n) { int len = 0; @@ -497,6 +503,16 @@ s_sum_L1_norms(int n, vector_t *vs) return sum; } +s123_t * +s_get_s123(void) +{ + s123_t *s = MIDL_user_allocate(sizeof *s); + s->f1 = 1; + s->f2 = 2; + s->f3 = 3; + return s; +} + str_t s_get_filename(void) { @@ -693,6 +709,7 @@ basic_tests(void) ok(x == 25, "RPC square_ref\n"); ok(str_length(string) == strlen(string), "RPC str_length\n"); + ok(str_t_length(string) == strlen(string), "RPC str_length\n"); ok(dot_self(&a) == 59, "RPC dot_self\n"); ok(str_struct_len(&ss) == lstrlenA(string), "RPC str_struct_len\n"); @@ -959,6 +976,7 @@ pointer_tests(void) name_t name; void *buffer; int *pa2; + s123_t *s123; ok(test_list_length(list) == 3, "RPC test_list_length\n"); ok(square_puint(p1) == 121, "RPC square_puint\n"); @@ -1012,6 +1030,10 @@ pointer_tests(void) pa2 = a; ok(sum_pcarr2(4, &pa2) == 10, "RPC sum_pcarr2\n"); + + s123 = get_s123(); + ok(s123->f1 == 1 && s123->f2 == 2 && s123->f3 == 3, "RPC get_s123\n"); + MIDL_user_free(s123); } static int diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index ec51757..7736e14 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -82,6 +82,7 @@ cpp_quote("#endif") void square_out(int x, [out] int *y); void square_ref([in, out] int *x); int str_length([string] const char *s); + int str_t_length(str_t s); int cstr_length([string, size_is(n)] const char *s, int n); int dot_self(vector_t *v); double square_half(double x, [out] double *y); @@ -300,6 +301,18 @@ cpp_quote("#endif") int sum_pcarr2(int n, [size_is(, n)] int **pa); int sum_L1_norms(int n, [size_is(n)] vector_t *vs); + /* Don't use this except in the get_s123 test. */ + typedef struct + { + int f1; + int f2; + int f3; + } s123_t; + + /* Make sure WIDL generates a type format string for a previously unseen + type as a return value. */ + s123_t *get_s123(void); + void get_5numbers([in] int count, [out, length_is(count)] pints_t pn[5]); void get_numbers([in] int length, [in] int size, [out, length_is(length), size_is(size)] pints_t pn[]); str_t get_filename(void); diff --git a/tools/widl/header.h b/tools/widl/header.h index 41784a0..656d4b2 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -78,7 +78,8 @@ static inline int last_array(const type_t *type) static inline int is_string_type(const attr_list_t *attrs, const type_t *type) { - return is_attr(attrs, ATTR_STRING) && (last_ptr(type) || last_array(type)); + return ((is_attr(attrs, ATTR_STRING) || is_attr(type->attrs, ATTR_STRING)) + && (last_ptr(type) || last_array(type))); } static inline int is_context_handle(const type_t *type) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f3af935..ae23f94 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2355,6 +2355,13 @@ static size_t process_tfs(FILE *file, const ifref_list_t *ifaces, type_pred_t pr { if (is_local(func->def->attrs)) continue; + if (!is_void(func->def->type)) + update_tfsoff(func->def->type, + write_typeformatstring_var( + file, 2, NULL, func->def->type, + func->def, &typeformat_offset), + file); + current_func = func; if (func->args) LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) @@ -2821,7 +2828,7 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, fprintf(file, ";\n"); } - if ((phase == PHASE_FREE) || (pointer_type == RPC_FC_UP)) + if (phase == PHASE_FREE || pass == PASS_RETURN || pointer_type == RPC_FC_UP) print_phase_function(file, indent, "Pointer", phase, var, start_offset - (type->size_is ? 4 : 2)); else

1 0

Frans Kool : crypt32: Created Dutch translations.
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: f8b94d3f5d62a9de1b15c2c464f628b7f921ef1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8b94d3f5d62a9de1b15c2c46… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Thu Feb 21 23:07:38 2008 +0100 crypt32: Created Dutch translations. --- dlls/crypt32/crypt32.rc | 1 + dlls/crypt32/crypt32_Nl.rc | 174 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32.rc b/dlls/crypt32/crypt32.rc index 0f98638..af0d77c 100644 --- a/dlls/crypt32/crypt32.rc +++ b/dlls/crypt32/crypt32.rc @@ -28,5 +28,6 @@ #include "crypt32_En.rc" #include "crypt32_Fr.rc" #include "crypt32_Ko.rc" +#include "crypt32_Nl.rc" #include "crypt32_No.rc" #include "crypt32_Sv.rc" diff --git a/dlls/crypt32/crypt32_Nl.rc b/dlls/crypt32/crypt32_Nl.rc new file mode 100644 index 0000000..b98f213 --- /dev/null +++ b/dlls/crypt32/crypt32_Nl.rc @@ -0,0 +1,174 @@ +/* + * Dutch crypt32 dll resources + * + * Copyright (C) 2008 Frans Kool + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_AUTHORITY_KEY_ID "Autoriteits Sleutel Identificatie nummer" + IDS_KEY_ATTRIBUTES "Sleutel Attributen" + IDS_KEY_USAGE_RESTRICTION "Sleutel Gebruiksbeperkingen" + IDS_SUBJECT_ALT_NAME "Onderwerp's Alternatieve Naam" + IDS_ISSUER_ALT_NAME "Verstrekker's Alternatieve Naam" + IDS_BASIC_CONSTRAINTS "Basis Beperkingen" + IDS_KEY_USAGE "Sleutel Gebruik" + IDS_CERT_POLICIES "Certificaat Beleid" + IDS_SUBJECT_KEY_IDENTIFIER "Onderwerp's Sleutel Identificatie nummer" + IDS_CRL_REASON_CODE "CRL Reden Code" + IDS_CRL_DIST_POINTS "CRL Distributie Locaties" + IDS_ENHANCED_KEY_USAGE "Uitgebreid Sleutel Gebruik" + IDS_AUTHORITY_INFO_ACCESS "Autoriteits Informatie Toegang" + IDS_CERT_EXTENSIONS "Certificaat Extensies" + IDS_NEXT_UPDATE_LOCATION "Volgende Update Locatie" + IDS_YES_OR_NO_TRUST "Wel of Geen Vertrouwen" + IDS_EMAIL_ADDRESS "Email Adres" + IDS_UNSTRUCTURED_NAME "Ongestructureerde Naam" + IDS_CONTENT_TYPE "Inhoud Type" + IDS_MESSAGE_DIGEST "Boodschap Samenvatting" + IDS_SIGNING_TIME "Tijd van Ondertekening" + IDS_COUNTER_SIGN "Counter Sign" + IDS_CHALLENGE_PASSWORD "Geheime Vraag Wachtwoord" + IDS_UNSTRUCTURED_ADDRESS "Ongestructureerd Adres" + IDS_SMIME_CAPABILITIES "SMIME Mogelijkheden" + IDS_PREFER_SIGNED_DATA "Prefereer Getekende Data" + IDS_CPS "CPS" + IDS_USER_NOTICE "Gebruikers Mededeling" + IDS_OCSP "On-line Certificaat Status Protocol" + IDS_CA_ISSUER "Certificatie Autoriteits Verstrekker" + IDS_CERT_TEMPLATE_NAME "Certificatie Template Naam" + IDS_CERT_TYPE "Type Certificaat" + IDS_CERT_MANIFOLD "Certificaat Verspreider" + IDS_NETSCAPE_CERT_TYPE "Netscape Certificaat Type" + IDS_NETSCAPE_BASE_URL "Netscape Basis URL" + IDS_NETSCAPE_REVOCATION_URL "Netscape Terugroep URL" + IDS_NETSCAPE_CA_REVOCATION_URL "Netscape CA Terugroep URL" + IDS_NETSCAPE_CERT_RENEWAL_URL "Netscape Cert Verversings URL" + IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Beleids URL" + IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL Server Naam" + IDS_NETSCAPE_COMMENT "Netscape Commentaar" + IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" + IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" + IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" + IDS_COUNTRY "Land/Regio" + IDS_ORGANIZATION "Organisatie" + IDS_ORGANIZATIONAL_UNIT "Organisatie Onderdeel" + IDS_COMMON_NAME "Gemeenschappelijke Naam" + IDS_LOCALITY "Localiteit" + IDS_STATE_OR_PROVINCE "Staat of Provincie" + IDS_TITLE "Titel" + IDS_GIVEN_NAME "Voornaam" + IDS_INITIALS "Initialen" + IDS_SUR_NAME "Achternaam" + IDS_DOMAIN_COMPONENT "Domein Component" + IDS_STREET_ADDRESS "Straat/Adres" + IDS_SERIAL_NUMBER "Registratie Nummer" + IDS_CA_VERSION "CA Versie" + IDS_CROSS_CA_VERSION "Cross CA Versie" + IDS_SERIALIZED_SIG_SERIAL_NUMBER "Geautomatiseerde Handtekening Serienummer" + IDS_PRINCIPAL_NAME "Hoofd Naam" + IDS_WINDOWS_PRODUCT_UPDATE "Windows Produkt Update" + IDS_ENROLLMENT_NAME_VALUE_PAIR "Inschrijvingsnaam Waarde Paar" + IDS_OS_VERSION "OS Versie" + IDS_ENROLLMENT_CSP "Inschrijving CSP" + IDS_CRL_NUMBER "CRL Nummer" + IDS_DELTA_CRL_INDICATOR "Delta CRL Indicatie" + IDS_ISSUING_DIST_POINT "Verstrekkend Distributie Punt" + IDS_FRESHEST_CRL "Nieuwste CRL" + IDS_NAME_CONSTRAINTS "Beperkingen op Naam" + IDS_POLICY_MAPPINGS "Beleids Mappingen" + IDS_POLICY_CONSTRAINTS "Beperkingen op Beleid" + IDS_CROSS_CERT_DIST_POINTS "Trans-Certificaat Distributie Punten" + IDS_APPLICATION_POLICIES "Applicatie Beleid" + IDS_APPLICATION_POLICY_MAPPINGS "Applicatie Beleids Mappingen" + IDS_APPLICATION_POLICY_CONSTRAINTS "Applicatie Beperkingen op Beleid" + IDS_CMC_DATA "CMC Data" + IDS_CMC_RESPONSE "CMC Antwoord" + IDS_UNSIGNED_CMC_REQUEST "Ongetekend CMC Verzoek" + IDS_CMC_STATUS_INFO "CMC Status Informatie" + IDS_CMC_EXTENSIONS "CMC Extensies" + IDS_CMC_ATTRIBUTES "CMC Attributen" + IDS_PKCS_7_DATA "PKCS 7 Data" + IDS_PKCS_7_SIGNED "PKCS 7 Ondertekend" + IDS_PKCS_7_ENVELOPED "PKCS 7 Omsloten" + IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 Getekend Omsloten" + IDS_PKCS_7_DIGESTED "PKCS 7 Samengevat" + IDS_PKCS_7_ENCRYPTED "PKCS 7 Gecodeerd" + IDS_PREVIOUS_CA_CERT_HASH "Vorige CA Certificaat Hash" + IDS_CRL_VIRTUAL_BASE "Virtueel Basis CRL Nummer" + IDS_CRL_NEXT_PUBLISH "Volgende CRL Publicatie" + IDS_CA_EXCHANGE "CA Coderings Certificaat" + IDS_KEY_RECOVERY_AGENT "Sleutel Herstel Agent" + IDS_CERTIFICATE_TEMPLATE "Certificaat Template Information" + IDS_ENTERPRISE_ROOT_OID "Ondernemings Basis OID" + IDS_RDN_DUMMY_SIGNER "Dummie Tekenaar" + IDS_ARCHIVED_KEY_ATTR "Gecodeerde Persoonlijke Sleutel" + IDS_CRL_SELF_CDP "Gepubliseerde CRL Locaties" + IDS_REQUIRE_CERT_CHAIN_POLICY "Afdwingen Certificaat Keten Beleid" + IDS_TRANSACTION_ID "Transactie Nummer" + IDS_SENDER_NONCE "Zender Nonce" + IDS_RECIPIENT_NONCE "Ontvanger Nonce" + IDS_REG_INFO "Registratie Informatie" + IDS_GET_CERTIFICATE "Haal Certificaat op" + IDS_GET_CRL "Haal CRL op" + IDS_REVOKE_REQUEST "Trek Verzoek In" + IDS_QUERY_PENDING "Verzoek in behandeling" + IDS_SORTED_CTL "Certificaat Vertrouwenslijst" + IDS_ARCHIVED_KEY_CERT_HASH "Gearchiveerde Sleutel Certificaat Hash" + IDS_PRIVATE_KEY_USAGE_PERIOD "Prive Sleutel Gebruik Periode" + IDS_CLIENT_INFORMATION "Cliënt Informatie" + IDS_SERVER_AUTHENTICATION "Server Authentificatie" + IDS_CLIENT_AUTHENTICATION "Cliënt Authentificatie" + IDS_CODE_SIGNING "Code Ondertekenen" + IDS_SECURE_EMAIL "Beveiligde Email" + IDS_TIME_STAMPING "Tijd Stempel Toekennen" + IDS_MICROSOFT_TRUST_LIST_SIGNING "Microsoft Trust Lijst Ondertekenen" + IDS_MICROSOFT_TIME_STAMPING "Microsoft Tijd Stempel Toekennen" + IDS_IPSEC_END_SYSTEM "IP beveiliging eind systeem" + IDS_IPSEC_TUNNEL "IP beveiliging tunnel afsluiting" + IDS_IPSEC_USER "IP beveiliging gebruiker" + IDS_EFS "Versleutelen Bestand Systeem" + IDS_WHQL_CRYPTO "Windows Hardware Driver Verificatie" + IDS_NT5_CRYPTO "Windows Systeem Component Verificatie" + IDS_OEM_WHQL_CRYPTO "OEM Windows Systeem Component Verificatie" + IDS_EMBEDDED_NT_CRYPTO "Ingebed Windows Systeem Componenten Verificatie" + IDS_KEY_PACK_LICENSES "Sleutel Verzameling Licenties" + IDS_LICENSE_SERVER "Licentie Server Verificatie" + IDS_SMART_CARD_LOGON "Smart Card Aanmelden" + IDS_DIGITAL_RIGHTS "Digitale Rechten" + IDS_QUALIFIED_SUBORDINATION "Gekwalificeerde Ondergeschiktheid" + IDS_KEY_RECOVERY "Sleutel Herstellen" + IDS_DOCUMENT_SIGNING "Document Ondertekenen" + IDS_IPSEC_IKE_INTERMEDIATE "IP beveiliging IKE tussenpersoon" + IDS_FILE_RECOVERY "Bestand Herstellen" + IDS_ROOT_LIST_SIGNER "Basis Lijst Ondertekenaar" + IDS_ANY_APPLICATION_POLICIES "Alle applicaties beleid" + IDS_DS_EMAIL_REPLICATION "Directory Service Email Replicatie" + IDS_ENROLLMENT_AGENT "Certificaat Verzoek Agent" + IDS_LIFETIME_SIGNING "Levensduur Ondertekenen" + IDS_ANY_CERT_POLICY "Alle uitgifte beleid" +} + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALIZEDNAME_ROOT "Vertrouwde Basis Certificatie Autoriteiten" + IDS_LOCALIZEDNAME_MY "Persoonlijk" + IDS_LOCALIZEDNAME_CA "Certificatie Tussen-Autoriteiten" + IDS_LOCALIZEDNAME_ADDRESSBOOK "Overige Personen" +}

1 0

Roderick Colenbrander : ddraw: Add yv12 detection support.
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: e2d70fff6b20f75193c0af672471607c0530e666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d70fff6b20f75193c0af672… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Feb 21 23:46:43 2008 +0100 ddraw: Add yv12 detection support. --- dlls/ddraw/utils.c | 5 +++++ dlls/wined3d/utils.c | 1 + include/wine/wined3d_types.h | 1 + 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 86222af..eada7a5 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -250,6 +250,7 @@ PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, case WINED3DFMT_UYVY: case WINED3DFMT_YUY2: + case WINED3DFMT_YV12: case WINED3DFMT_DXT1: case WINED3DFMT_DXT2: case WINED3DFMT_DXT3: @@ -553,6 +554,10 @@ PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat) { return WINED3DFMT_YUY2; } + if(DDPixelFormat->dwFourCC == MAKEFOURCC('Y', 'V', '1', '2')) + { + return WINED3DFMT_YV12; + } if(DDPixelFormat->dwFourCC == MAKEFOURCC('D', 'X', 'T', '1')) { return WINED3DFMT_DXT1; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 56745db..86e9c5e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -43,6 +43,7 @@ static const StaticPixelFormatDesc formats[] = { /* FourCC formats, kept here to have WINED3DFMT_R8G8B8(=20) at position 20 */ {WINED3DFMT_UYVY ,0x0 ,0x0 ,0x0 ,0x0 ,1/*?*/ ,0 ,0 ,TRUE }, {WINED3DFMT_YUY2 ,0x0 ,0x0 ,0x0 ,0x0 ,1/*?*/ ,0 ,0 ,TRUE }, + {WINED3DFMT_YV12 ,0x0 ,0x0 ,0x0 ,0x0 ,1/*?*/ ,0 ,0 ,TRUE }, {WINED3DFMT_DXT1 ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,0 ,0 ,TRUE }, {WINED3DFMT_DXT2 ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,0 ,0 ,TRUE }, {WINED3DFMT_DXT3 ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,0 ,0 ,TRUE }, diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 477df24..d855283 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -266,6 +266,7 @@ typedef enum _WINED3DFORMAT { WINED3DFMT_UYVY = WINEMAKEFOURCC('U', 'Y', 'V', 'Y'), WINED3DFMT_YUY2 = WINEMAKEFOURCC('Y', 'U', 'Y', '2'), + WINED3DFMT_YV12 = WINEMAKEFOURCC('Y', 'V', '1', '2'), WINED3DFMT_DXT1 = WINEMAKEFOURCC('D', 'X', 'T', '1'), WINED3DFMT_DXT2 = WINEMAKEFOURCC('D', 'X', 'T', '2'), WINED3DFMT_DXT3 = WINEMAKEFOURCC('D', 'X', 'T', '3'),

1 0

Maarten Lankhorst : advapi: Check if service really exists before bombing out in CreateService.
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: 284f86183cce638ff8fce4023cb76273e979aa09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=284f86183cce638ff8fce4023… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Feb 21 13:16:25 2008 -0800 advapi: Check if service really exists before bombing out in CreateService. --- dlls/advapi32/service.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 9f27c40..7a000be 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1302,19 +1302,9 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, { HKEY service_key; - /* The service already exists, so bail out */ - if(!lstrcmpiW(lpServiceName, buffer)) - { - SetLastError(ERROR_SERVICE_EXISTS); - return NULL; - } - - /* The given displayname matches the found servicename. We don't bail out - * as servicename is checked before a duplicate displayname + /* Open service first before deciding whether it already exists or not + * It could be that it's not a valid service, but only the registry key itself exists */ - if(!lstrcmpiW(lpDisplayName, buffer)) - displayname_exists = TRUE; - if (RegOpenKeyExW(hscm->hkey, buffer, 0, KEY_READ, &service_key) == ERROR_SUCCESS) { WCHAR name[MAX_PATH]; @@ -1322,9 +1312,16 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, if (RegQueryValueExW(service_key, szDisplayName, NULL, NULL, (LPBYTE)name, &size) == ERROR_SUCCESS) { - /* The given displayname matches the found displayname */ - if (!lstrcmpiW(lpDisplayName, name)) + if (lpDisplayName && (!lstrcmpiW(lpDisplayName, name) + || !lstrcmpiW(lpDisplayName, buffer))) displayname_exists = TRUE; + + if (!lstrcmpiW(lpServiceName, buffer)) + { + RegCloseKey(service_key); + SetLastError(ERROR_SERVICE_EXISTS); + return NULL; + } } RegCloseKey(service_key); } @@ -1332,7 +1329,7 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, len = sizeof(buffer); } - if (lpDisplayName && displayname_exists) + if (displayname_exists) { SetLastError(ERROR_DUPLICATE_SERVICE_NAME); return NULL;

1 0