wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Jacek Caban : mshtml: Fixed HTMLPrivateWindow_GetAddressBarUrl function name.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 52826af93c37ebf87e8c7e9b2a787a6cde719b1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=52826af93c37ebf87e8c7e9b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 12 14:32:47 2011 +0100 mshtml: Fixed HTMLPrivateWindow_GetAddressBarUrl function name. --- dlls/mshtml/htmlwindow.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 650d18f..1b09697 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2034,7 +2034,7 @@ static HRESULT WINAPI HTMLPrivateWindow_FindWindowByName(IHTMLPrivateWindow *ifa return E_NOTIMPL; } -static HRESULT WINAPI HTMLPrivateWindow_GetAddressBar(IHTMLPrivateWindow *iface, BSTR *url) +static HRESULT WINAPI HTMLPrivateWindow_GetAddressBarUrl(IHTMLPrivateWindow *iface, BSTR *url) { HTMLWindow *This = impl_from_IHTMLPrivateWindow(iface); TRACE("(%p)->(%p)\n", This, url); @@ -2055,7 +2055,7 @@ static const IHTMLPrivateWindowVtbl HTMLPrivateWindowVtbl = { HTMLPrivateWindow_SetPICSTarget, HTMLPrivateWindow_PICSComplete, HTMLPrivateWindow_FindWindowByName, - HTMLPrivateWindow_GetAddressBar + HTMLPrivateWindow_GetAddressBarUrl }; static inline HTMLWindow *impl_from_IDispatchEx(IDispatchEx *iface)

1 0

Jacek Caban : mshtml: Use set_nsstyle_attr_var in IHTMLStyle:: put_height implementation.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 6f9e67e0b45804e7256959819d3f11bb7935b588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9e67e0b45804e7256959819… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 12 14:32:31 2011 +0100 mshtml: Use set_nsstyle_attr_var in IHTMLStyle::put_height implementation. --- dlls/mshtml/htmlstyle.c | 10 +--------- dlls/mshtml/tests/style.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index a9c6133..f006193 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2069,15 +2069,7 @@ static HRESULT WINAPI HTMLStyle_put_height(IHTMLStyle *iface, VARIANT v) TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - switch(V_VT(&v)) { - case VT_BSTR: - return set_style_attr(This, STYLEID_HEIGHT, V_BSTR(&v), 0); - default: - FIXME("unimplemented vt %d\n", V_VT(&v)); - return E_NOTIMPL; - } - - return S_OK; + return set_nsstyle_attr_var(This->nsstyle, STYLEID_HEIGHT, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_height(IHTMLStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index e37c593..bdb3dc2 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -872,7 +872,7 @@ static void test_body_style(IHTMLStyle *style) "expected 4.0 or 4.9 (IE8) got %f\n", f); V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr("64px"); + V_BSTR(&v) = a2bstr("70px"); hres = IHTMLStyle_put_height(style, v); ok(hres == S_OK, "put_height failed: %08x\n", hres); VariantClear(&v); @@ -881,6 +881,18 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_height(style, &v); ok(hres == S_OK, "get_height failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "70px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_I4; + V_I4(&v) = 64; + hres = IHTMLStyle_put_height(style, v); + ok(hres == S_OK, "put_height failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle_get_height(style, &v); + ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!strcmp_wa(V_BSTR(&v), "64px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v);

1 0

Marcus Meissner : gdi32: Fixed loop end setting (Coverity).
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 4222ccf1cf50618fb804fc3dcc492b6db0d3dff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4222ccf1cf50618fb804fc3dc… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Nov 12 12:09:33 2011 +0100 gdi32: Fixed loop end setting (Coverity). --- dlls/gdi32/freetype.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9137322..06350be 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4588,7 +4588,7 @@ static BOOL enum_face_charsets(Face *face, struct enum_charset_list *list, if(!face->scalable && face->fs.fsCsb[0] == 0) { /* OEM bitmap */ elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET; load_script_name( IDS_OEM_DOS, elf.elfScript ); - i = 32; /* break out of loop */ + i = list->total; /* break out of loop after enumeration */ } else if(!(face->fs.fsCsb[0] & list->element[i].mask)) continue; else { @@ -4600,7 +4600,7 @@ static BOOL enum_face_charsets(Face *face, struct enum_charset_list *list, TRACE("enuming face %s full %s style %s charset = %d type %d script %s it %d weight %d ntmflags %08x\n", debugstr_w(elf.elfLogFont.lfFaceName), debugstr_w(elf.elfFullName), debugstr_w(elf.elfStyle), - list->element[i].charset, type, debugstr_w(elf.elfScript), + elf.elfLogFont.lfCharSet, type, debugstr_w(elf.elfScript), elf.elfLogFont.lfItalic, elf.elfLogFont.lfWeight, ntm.ntmTm.ntmFlags); /* release section before callback (FIXME) */

1 0

Marcus Meissner : wmc: Increate allocated size to match \0 (Coverity).
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: af14cb60f7af67472cf7494eb5d0395cb7bd068e URL: http://source.winehq.org/git/wine.git/?a=commit;h=af14cb60f7af67472cf7494eb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Nov 12 09:04:51 2011 +0100 wmc: Increate allocated size to match \0 (Coverity). --- tools/wmc/wmc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 837cfa6..c9ad9c4 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -164,7 +164,7 @@ int main(int argc,char *argv[]) /* First rebuild the commandline to put in destination */ /* Could be done through env[], but not all OS-es support it */ - cmdlen = 4; /* for "wmc " */ + cmdlen = 5; /* for "wmc " and \0 */ for(i = 1; i < argc; i++) cmdlen += strlen(argv[i]) + 1; cmdline = xmalloc(cmdlen);

1 0

André Hentschel : unicows: Add GetRoleTextW from oleacc.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: ebde184b4c268a73a89b0593bd94b9637896f42c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebde184b4c268a73a89b0593b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 11 19:13:26 2011 +0100 unicows: Add GetRoleTextW from oleacc. --- dlls/unicows/Makefile.in | 2 +- dlls/unicows/unicows.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/unicows/Makefile.in b/dlls/unicows/Makefile.in index d368636..aa61da4 100644 --- a/dlls/unicows/Makefile.in +++ b/dlls/unicows/Makefile.in @@ -1,6 +1,6 @@ MODULE = unicows.dll IMPORTLIB = unicows IMPORTS = avicap32 msvfw32 oledlg comdlg32 shell32 winmm winspool \ - rasapi32 secur32 sensapi version user32 mpr gdi32 advapi32 + rasapi32 secur32 sensapi version oleacc user32 mpr gdi32 advapi32 @MAKE_DLL_RULES@ diff --git a/dlls/unicows/unicows.spec b/dlls/unicows/unicows.spec index 47ba26f..c008ea7 100644 --- a/dlls/unicows/unicows.spec +++ b/dlls/unicows/unicows.spec @@ -227,7 +227,7 @@ @ stdcall GetProfileStringW(wstr wstr wstr ptr long) @ stdcall GetPropA(long str) @ stdcall GetPropW(long wstr) -@ stub GetRoleTextW +@ stdcall GetRoleTextW(long ptr long) @ stdcall GetSaveFileNamePreviewW(ptr) @ stdcall GetSaveFileNameW(ptr) @ stdcall GetShortPathNameW(wstr ptr long)

1 0

Andrew Talbot : atl: Remove an unused variable.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: a41cbc1423e7317f51d6a3fc65552f0c3af502aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a41cbc1423e7317f51d6a3fc6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 10 22:11:48 2011 +0000 atl: Remove an unused variable. --- dlls/atl/registrar.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 7edd739..4fcf28d 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -844,8 +844,6 @@ HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR return do_register_dll_server(pReg, module_name, lpszRes, bRegister, pMapEntries); } -static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0}; - /*********************************************************************** * DllRegisterServer (ATL.@) */

1 0

Andrew Talbot : appwiz.cpl: Remove an unused function.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: cedeac3191eaab0fc53471fdfc8fb949ac459ef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cedeac3191eaab0fc53471fdf… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 10 22:11:24 2011 +0000 appwiz.cpl: Remove an unused function. --- dlls/appwiz.cpl/addons.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 3099ec8..0e3591b 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -74,19 +74,6 @@ static const WCHAR mshtml_keyW[] = static HWND install_dialog = NULL; static LPWSTR url = NULL; -static inline char *heap_strdupWtoA(LPCWSTR str) -{ - char *ret = NULL; - - if(str) { - DWORD size = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); - ret = heap_alloc(size); - WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); - } - - return ret; -} - /* SHA definitions are copied from advapi32. They aren't available in headers. */ typedef struct {

1 0

Andrew Talbot : advapi32: Remove an unused variable.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 8a1539ac98e31c629d30e454eddee6fe8ebf49bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a1539ac98e31c629d30e454e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 10 22:10:50 2011 +0000 advapi32: Remove an unused variable. --- dlls/advapi32/service.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 2fc3d71..bb5e49c 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -45,10 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(service); -static const WCHAR szServiceManagerKey[] = { 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'S','e','r','v','i','c','e','s',0 }; - void __RPC_FAR * __RPC_USER MIDL_user_allocate(SIZE_T len) { return HeapAlloc(GetProcessHeap(), 0, len);

1 0

Francois Gouget : kernel32: Declare more TimerQueue functions in winbase.h.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 1c108d1acbe71dacb9ad3a6ed39380a8cd12c2a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c108d1acbe71dacb9ad3a6ed… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 10 14:38:27 2011 +0100 kernel32: Declare more TimerQueue functions in winbase.h. --- include/winbase.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index a37d073..c84c1f1 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1360,6 +1360,7 @@ WINBASEAPI BOOL WINAPI CallNamedPipeW(LPCWSTR,LPVOID,DWORD,LPVOID,DWORD,L #define CallNamedPipe WINELIB_NAME_AW(CallNamedPipe) WINBASEAPI BOOL WINAPI CancelIo(HANDLE); WINBASEAPI BOOL WINAPI CancelIoEx(HANDLE,LPOVERLAPPED); +WINBASEAPI BOOL WINAPI CancelTimerQueueTimer(HANDLE,HANDLE); WINBASEAPI BOOL WINAPI CancelWaitableTimer(HANDLE); WINBASEAPI BOOL WINAPI ChangeTimerQueueTimer(HANDLE,HANDLE,ULONG,ULONG); WINADVAPI BOOL WINAPI CheckTokenMembership(HANDLE,PSID,PBOOL); @@ -1477,6 +1478,7 @@ WINBASEAPI void WINAPI DeleteFiber(LPVOID); WINBASEAPI BOOL WINAPI DeleteFileA(LPCSTR); WINBASEAPI BOOL WINAPI DeleteFileW(LPCWSTR); #define DeleteFile WINELIB_NAME_AW(DeleteFile) +WINBASEAPI BOOL WINAPI DeleteTimerQueue(HANDLE); WINBASEAPI BOOL WINAPI DeleteTimerQueueEx(HANDLE,HANDLE); WINBASEAPI BOOL WINAPI DeleteTimerQueueTimer(HANDLE,HANDLE,HANDLE); WINBASEAPI BOOL WINAPI DeleteVolumeMountPointA(LPCSTR); @@ -2133,6 +2135,7 @@ WINBASEAPI DWORD WINAPI SetThreadIdealProcessor(HANDLE,DWORD); WINBASEAPI BOOL WINAPI SetThreadPriority(HANDLE,INT); WINBASEAPI BOOL WINAPI SetThreadPriorityBoost(HANDLE,BOOL); WINADVAPI BOOL WINAPI SetThreadToken(PHANDLE,HANDLE); +WINBASEAPI HANDLE WINAPI SetTimerQueueTimer(HANDLE,WAITORTIMERCALLBACK,PVOID,DWORD,DWORD,BOOL); WINBASEAPI BOOL WINAPI SetTimeZoneInformation(const TIME_ZONE_INFORMATION *); WINADVAPI BOOL WINAPI SetTokenInformation(HANDLE,TOKEN_INFORMATION_CLASS,LPVOID,DWORD); WINBASEAPI LPTOP_LEVEL_EXCEPTION_FILTER WINAPI SetUnhandledExceptionFilter(LPTOP_LEVEL_EXCEPTION_FILTER);

1 0

Jacek Caban : mshtml: Fixed memory leak in nsIURL:: GetDirectory implementation.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 734050f5c57cba6dfafe36a15c27a6dee1120152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=734050f5c57cba6dfafe36a15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 10 14:35:59 2011 +0100 mshtml: Fixed memory leak in nsIURL::GetDirectory implementation. --- dlls/mshtml/nsio.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index bf41f35..d266ddf 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2427,6 +2427,7 @@ static nsresult NSAPI nsURL_GetDirectory(nsIURL *iface, nsACString *aDirectory) SysFreeString(path); TRACE("ret %s\n", debugstr_a(dir)); nsACString_SetData(aDirectory, dir ? dir : ""); + heap_free(dir); return NS_OK; }

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2011