March 2011 - Wine-commits - list.winehq.org

André Hentschel : cabinet: Be more verbose.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 9701621f0ff6ed5089780e70efb8e8c5a3667f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9701621f0ff6ed5089780e70e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 21 22:41:00 2011 +0100 cabinet: Be more verbose. --- dlls/cabinet/fdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 5fc22cd..a004c1d 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2533,7 +2533,7 @@ BOOL __cdecl FDICopy( /* check if it's really a cabfile. Note that this doesn't implement the bug */ if (!FDI_read_entries(fdi, cabhf, &fdici, &(CAB(mii)))) { - ERR("FDIIsCabinet failed.\n"); + ERR("FDIIsCabinet failed: %u.\n", fdi->perf->erfOper); fdi->free(decomp_state); fdi->close(cabhf); return FALSE;

1 0

Austin English : mshtml: Avoid shadowing a parameter.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: c199a468578d03e051c2b2972de3c88262f65993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c199a468578d03e051c2b2972… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 21 17:40:33 2011 -0700 mshtml: Avoid shadowing a parameter. --- dlls/mshtml/htmlwindow.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 656999e..695b829 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2148,22 +2148,22 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD switch(prop->type) { case GLOBAL_SCRIPTVAR: { - IDispatchEx *dispex; + IDispatchEx *iface; IDispatch *disp; disp = get_script_disp(prop->script_host); if(!disp) return E_UNEXPECTED; - hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&iface); if(SUCCEEDED(hres)) { TRACE("%s >>>\n", debugstr_w(prop->name)); - hres = IDispatchEx_InvokeEx(dispex, prop->id, lcid, flags, params, res, ei, caller); + hres = IDispatchEx_InvokeEx(iface, prop->id, lcid, flags, params, res, ei, caller); if(hres == S_OK) TRACE("%s <<<\n", debugstr_w(prop->name)); else WARN("%s <<< %08x\n", debugstr_w(prop->name), hres); - IDispatchEx_Release(dispex); + IDispatchEx_Release(iface); }else { FIXME("No IDispatchEx\n"); }

1 0

Dmitry Timoshkov : winex11.drv: Do not use any window types except _NET_WM_WINDOW_TYPE_NORMAL.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 5ef58c11ce28c963908672f5c5c1fde866272ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef58c11ce28c963908672f5c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 22 15:11:40 2011 +0800 winex11.drv: Do not use any window types except _NET_WM_WINDOW_TYPE_NORMAL. Main window of the Atom Zombie Smasher game has WS_DLGFRAME style set, but Metacity allows making fullscreen ONLY normal windows, so do not use any window types except _NET_WM_WINDOW_TYPE_NORMAL. --- dlls/winex11.drv/window.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 0e55619..e2ffccc 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1169,17 +1169,7 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) /* size hints */ set_size_hints( display, data, style ); - /* set the WM_WINDOW_TYPE */ - if (style & WS_THICKFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); - else if (ex_style & WS_EX_APPWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); - else if (style & WS_MINIMIZEBOX) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); - else if (style & WS_DLGFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); - else if (ex_style & WS_EX_DLGMODALFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); - /* many window managers don't handle utility windows very well, so we don't use TYPE_UTILITY here */ - else if (ex_style & WS_EX_TOOLWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); - else if ((style & WS_POPUP) && owner) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); - else window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); - + window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE), XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1);

1 0

Dmitry Timoshkov : ntdll: Add a bunch of NtCreateFile tests.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 3998820497423dcc0a619aef8c8b3ae13f166202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3998820497423dcc0a619aef8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 22 19:38:44 2011 +0800 ntdll: Add a bunch of NtCreateFile tests. --- dlls/ntdll/tests/file.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 58e4a4b..cc91eb6 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3,6 +3,7 @@ * Copyright 2007 Jeff Latimer * Copyright 2007 Andrey Turkin * Copyright 2008 Jeff Zaroyko + * Copyright 2011 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1554,6 +1555,102 @@ todo_wine CloseHandle( dir ); } +static void test_NtCreateFile(void) +{ + static const struct test_data + { + DWORD disposition, attrib_in, status, result, attrib_out, needs_cleanup; + } td[] = + { + /* 0*/{ FILE_CREATE, FILE_ATTRIBUTE_READONLY, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, FALSE }, + /* 1*/{ FILE_CREATE, 0, STATUS_OBJECT_NAME_COLLISION, 0, 0, TRUE }, + /* 2*/{ FILE_CREATE, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, + /* 3*/{ FILE_OPEN, FILE_ATTRIBUTE_READONLY, 0, FILE_OPENED, FILE_ATTRIBUTE_ARCHIVE, TRUE }, + /* 4*/{ FILE_OPEN, FILE_ATTRIBUTE_READONLY, STATUS_OBJECT_NAME_NOT_FOUND, 0, 0, FALSE }, + /* 5*/{ FILE_OPEN_IF, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, + /* 6*/{ FILE_OPEN_IF, FILE_ATTRIBUTE_READONLY, 0, FILE_OPENED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, + /* 7*/{ FILE_OVERWRITE, FILE_ATTRIBUTE_READONLY, 0, FILE_OVERWRITTEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, FALSE }, + /* 8*/{ FILE_OVERWRITE_IF, 0, STATUS_ACCESS_DENIED, 0, 0, FALSE }, + /* 9*/{ FILE_OVERWRITE_IF, FILE_ATTRIBUTE_READONLY, 0, FILE_OVERWRITTEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, FALSE }, + /*10*/{ FILE_SUPERSEDE, 0, 0, FILE_SUPERSEDED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, + /*11*/{ FILE_SUPERSEDE, FILE_ATTRIBUTE_READONLY, 0, FILE_SUPERSEDED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, TRUE }, + /*12*/{ FILE_SUPERSEDE, FILE_ATTRIBUTE_READONLY, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, TRUE } + }; + static const WCHAR fooW[] = {'f','o','o',0}; + static const WCHAR dotW[] = {'.',0}; + NTSTATUS status; + HANDLE handle; + WCHAR path[MAX_PATH]; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + UNICODE_STRING nameW; + DWORD ret, i; + + GetTempFileNameW(dotW, fooW, 0, path); + DeleteFileW(path); + pRtlDosPathNameToNtPathName_U(path, &nameW, NULL, NULL); + + attr.Length = sizeof(attr); + attr.RootDirectory = NULL; + attr.ObjectName = &nameW; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + status = pNtCreateFile(&handle, GENERIC_READ, &attr, &io, NULL, + td[i].attrib_in, FILE_SHARE_READ|FILE_SHARE_WRITE, + td[i].disposition, 0, NULL, 0); + + /* FIXME: completely remove once Wine is fixed */ + if (td[i].status == STATUS_ACCESS_DENIED) + { + todo_wine + ok(status == td[i].status, "%d: expected %#x got %#x\n", i, td[i].status, status); + CloseHandle(handle); + SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); + continue; + } + + ok(status == td[i].status, "%d: expected %#x got %#x\n", i, td[i].status, status); + + if (status == STATUS_ACCESS_DENIED) + { + SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); + continue; + } + + if (!status) + { + ok(io.Information == td[i].result,"%d: expected %#x got %#lx\n", i, td[i].result, io.Information); + + ret = GetFileAttributesW(path); + ret &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; + /* FIXME: leave only 'else' case below once Wine is fixed */ + if (ret != td[i].attrib_out) + { + todo_wine + ok(ret == td[i].attrib_out, "%d: expected %#x got %#x\n", i, td[i].attrib_out, ret); + SetFileAttributesW(path, td[i].attrib_out); + } + else + ok(ret == td[i].attrib_out, "%d: expected %#x got %#x\n", i, td[i].attrib_out, ret); + + CloseHandle(handle); + } + + if (td[i].needs_cleanup) + { + SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); + DeleteFileW(path); + } + } + + SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); + DeleteFileW( path ); +} + START_TEST(file) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); @@ -1590,6 +1687,7 @@ START_TEST(file) pNtQueryDirectoryFile = (void *)GetProcAddress(hntdll, "NtQueryDirectoryFile"); pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile"); + test_NtCreateFile(); create_file_test(); open_file_test(); delete_file_test();

1 0

David Hedberg : msi: Add an offset to sequence numbers belonging to files added by a patch.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: fed6e5211c6f743fd3889ed5bf667ae79c561930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fed6e5211c6f743fd3889ed5b… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Tue Mar 22 20:45:09 2011 +0100 msi: Add an offset to sequence numbers belonging to files added by a patch. --- dlls/msi/action.c | 251 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/database.c | 2 + dlls/msi/msipriv.h | 3 + dlls/msi/tests/patch.c | 77 +++++++++++++++ 4 files changed, 333 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fed6e5211c6f743fd3889…

1 0

David Hedberg : msi: Generalize media helpers a bit.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 18973df9c7ae9f6f9ce45867c4de3fb23915ead6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18973df9c7ae9f6f9ce45867c… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Tue Mar 22 20:45:10 2011 +0100 msi: Generalize media helpers a bit. --- dlls/msi/files.c | 5 +++-- dlls/msi/media.c | 10 +++++----- dlls/msi/msipriv.h | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 1f61873..4d8c502 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -302,7 +302,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { - rc = msi_load_media_info( package, file, mi ); + rc = msi_load_media_info( package, file->Sequence, mi ); if (rc != ERROR_SUCCESS) { ERR("Unable to load media info for %s (%u)\n", debugstr_w(file->File), rc); @@ -310,7 +310,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) } if (!file->Component->Enabled) continue; - if (file->state != msifs_hashmatch && (rc = ready_media( package, file, mi ))) + if (file->state != msifs_hashmatch && + (rc = ready_media( package, file->Sequence, file->IsCompressed, mi ))) { ERR("Failed to ready media for %s\n", debugstr_w(file->File)); goto done; diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 37d3530..7cf7585 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -656,7 +656,7 @@ static UINT get_drive_type(const WCHAR *path) return GetDriveTypeW(root); } -UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) +UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi) { MSIRECORD *row; LPWSTR source_dir; @@ -669,7 +669,7 @@ UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) '`','L','a','s','t','S','e','q','u','e','n','c','e','`',' ','>','=',' ','%','i', ' ','O','R','D','E','R',' ','B','Y',' ','`','D','i','s','k','I','d','`',0}; - row = MSI_QueryGetRecord(package->db, query, file->Sequence); + row = MSI_QueryGetRecord(package->db, query, Sequence); if (!row) { TRACE("Unable to query row\n"); @@ -815,7 +815,7 @@ static UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) return ERROR_FUNCTION_FAILED; } -UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) +UINT ready_media(MSIPACKAGE *package, UINT Sequence, BOOL IsCompressed, MSIMEDIAINFO *mi) { UINT rc = ERROR_SUCCESS; WCHAR *cabinet_file; @@ -831,7 +831,7 @@ UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) cabinet_file = get_cabinet_filename(mi); /* package should be downloaded */ - if (file->IsCompressed && + if (IsCompressed && GetFileAttributesW(cabinet_file) == INVALID_FILE_ATTRIBUTES && package->BaseURL && UrlIsW(package->BaseURL, URLIS_URL)) { @@ -874,7 +874,7 @@ UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) } } - if (file->IsCompressed && + if (IsCompressed && GetFileAttributesW(cabinet_file) == INVALID_FILE_ATTRIBUTES) { rc = find_published_source(package, mi); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 1a0bee0..266c25e 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -990,8 +990,8 @@ typedef struct PVOID user; } MSICABDATA; -extern UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi); -extern UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi); +extern UINT ready_media(MSIPACKAGE *package, UINT Sequence, BOOL IsCompressed, MSIMEDIAINFO *mi); +extern UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi); extern void msi_free_media_info(MSIMEDIAINFO *mi); extern BOOL msi_cabextract(MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data);

1 0

David Hedberg : msi: Add support for patching files.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 6771ed40e808bfaadaee49aae9cbc7092686994a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6771ed40e808bfaadaee49aae… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Tue Mar 22 20:45:11 2011 +0100 msi: Add support for patching files. --- dlls/msi/action.c | 73 ++++++++++++++++++++++--- dlls/msi/files.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/helpers.c | 14 +++++ dlls/msi/msipriv.h | 14 +++++ dlls/msi/package.c | 1 + include/msidefs.h | 6 ++- 6 files changed, 252 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6771ed40e808bfaadaee4…

1 0

Joshua Beck : winex11: Improved error handling in pglXMakeCurrent() call.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: ddada6753836faac170b9613b1d237d937b41ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddada6753836faac170b9613b… Author: Joshua Beck <jxb091000(a)utdallas.edu> Date: Thu Mar 24 01:50:33 2011 -0500 winex11: Improved error handling in pglXMakeCurrent() call. --- dlls/winex11.drv/opengl.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index a9cc178..b74bc0a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -344,8 +344,11 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) else win = root; - pglXMakeCurrent(gdi_display, win, ctx); - + if(pglXMakeCurrent(gdi_display, win, ctx) == 0) + { + ERR_(winediag)( "Unable to activate OpenGL context, most likely your OpenGL drivers haven't been installed correctly\n" ); + goto done; + } WineGLInfo.glVersion = (const char *) pglGetString(GL_VERSION); str = (const char *) pglGetString(GL_EXTENSIONS); WineGLInfo.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1);

1 0

David Hedberg : comdlg32: Add DllGetClassObject and a default class factory .
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 55c717e84cd87d841da49f4fbd3210efaa2479a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55c717e84cd87d841da49f4fb… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Mar 24 22:38:50 2011 +0100 comdlg32: Add DllGetClassObject and a default class factory. --- dlls/comdlg32/cdlg32.c | 97 +++++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/comdlg32.spec | 1 + 2 files changed, 98 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c index 9502443..0982dfb 100644 --- a/dlls/comdlg32/cdlg32.c +++ b/dlls/comdlg32/cdlg32.c @@ -21,6 +21,8 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -167,3 +169,98 @@ DWORD WINAPI CommDlgExtendedError(void) else return 0; /* we never set an error, so there isn't one */ } + +/************************************************************************* + * Implement the CommDlg32 class factory + * + * (Taken from shdocvw/factory.c; based on implementation in + * ddraw/main.c) + */ +typedef struct +{ + IClassFactory IClassFactory_iface; + HRESULT (*cf)(IUnknown*, REFIID, void**); +} IClassFactoryImpl; + +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + +/************************************************************************* + * CDLGCF_QueryInterface (IUnknown) + */ +static HRESULT WINAPI CDLGCF_QueryInterface(IClassFactory* iface, + REFIID riid, void **ppobj) +{ + TRACE("%p (%s %p)\n", iface, debugstr_guid(riid), ppobj); + + if(!ppobj) + return E_POINTER; + + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IClassFactory, riid)) + { + *ppobj = iface; + IClassFactory_AddRef(iface); + return S_OK; + } + + WARN("Interface not supported.\n"); + + *ppobj = NULL; + return E_NOINTERFACE; +} + +/************************************************************************* + * CDLGCF_AddRef (IUnknown) + */ +static ULONG WINAPI CDLGCF_AddRef(IClassFactory *iface) +{ + return 2; /* non-heap based object */ +} + +/************************************************************************* + * CDLGCF_Release (IUnknown) + */ +static ULONG WINAPI CDLGCF_Release(IClassFactory *iface) +{ + return 1; /* non-heap based object */ +} + +/************************************************************************* + * CDLGCF_CreateInstance (IClassFactory) + */ +static HRESULT WINAPI CDLGCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + return This->cf(pOuter, riid, ppobj); +} + +/************************************************************************* + * CDLGCF_LockServer (IClassFactory) + */ +static HRESULT WINAPI CDLGCF_LockServer(IClassFactory *iface, BOOL dolock) +{ + TRACE("%p (%d)\n", iface, dolock); + return S_OK; +} + +static const IClassFactoryVtbl CDLGCF_Vtbl = +{ + CDLGCF_QueryInterface, + CDLGCF_AddRef, + CDLGCF_Release, + CDLGCF_CreateInstance, + CDLGCF_LockServer +}; + +/************************************************************************* + * DllGetClassObject (COMMDLG32.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + TRACE("%s, %s, %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/comdlg32/comdlg32.spec b/dlls/comdlg32/comdlg32.spec index 618ccd0..118d3d7 100644 --- a/dlls/comdlg32/comdlg32.spec +++ b/dlls/comdlg32/comdlg32.spec @@ -3,6 +3,7 @@ @ stdcall ChooseFontA(ptr) @ stdcall ChooseFontW(ptr) @ stdcall CommDlgExtendedError() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall FindTextA(ptr) @ stdcall FindTextW(ptr) @ stdcall GetFileTitleA(str ptr long)

1 0

Alexandre Julliard : msxml3/tests: Avoid size_t in a trace.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 8e59bbb02726fd1aada6d010fa8ef7bf9d0abd81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e59bbb02726fd1aada6d010f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 21:22:47 2011 +0200 msxml3/tests: Avoid size_t in a trace. --- dlls/msxml3/tests/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 75fec54..29c20bf 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7258,7 +7258,7 @@ static void test_nodeTypedValue(void) if (entry->type == (VT_ARRAY|VT_UI1)) { ok(V_ARRAY(&value)->rgsabound[0].cElements == strlen(entry->value), - "incorrect array size, got %d, expected %d\n", V_ARRAY(&value)->rgsabound[0].cElements, strlen(entry->value)); + "incorrect array size %d\n", V_ARRAY(&value)->rgsabound[0].cElements); } if (entry->type != VT_BSTR)

1 0