wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Alexandre Julliard : wine.inf: Avoid creating empty registry values.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: 7fb42984e2d5dc71d8ee2e9c166811d6da369b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb42984e2d5dc71d8ee2e9c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 9 11:36:54 2012 +0100 wine.inf: Avoid creating empty registry values. --- tools/wine.inf.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 14e9245..463ecfd 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -3049,9 +3049,9 @@ ErrorControl=1 [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 -HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters" -HKLM,"System\CurrentControlSet\Services\Winsock\Parameters" -HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters" +HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 +HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 +HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters",,16 [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1"

1 0

Jacek Caban : msident: Added stub DLL.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: aadc5cb6de4c13bed8d40cc16bc94fb8a8719cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=aadc5cb6de4c13bed8d40cc16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 9 11:12:25 2012 +0100 msident: Added stub DLL. --- configure | 1 + configure.ac | 1 + dlls/msident/Makefile.in | 6 ++++ dlls/msident/msident.c | 61 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msident/msident.spec | 2 + 5 files changed, 71 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 55464c7..e7d691d 100755 --- a/configure +++ b/configure @@ -15150,6 +15150,7 @@ wine_fn_config_dll mshtml enable_mshtml implib,po wine_fn_config_test dlls/mshtml/tests mshtml_test wine_fn_config_dll msi enable_msi implib,po wine_fn_config_test dlls/msi/tests msi_test +wine_fn_config_dll msident enable_msident wine_fn_config_dll msimg32 enable_msimg32 implib wine_fn_config_dll msimsg enable_msimsg wine_fn_config_dll msimtf enable_msimtf diff --git a/configure.ac b/configure.ac index 357c829..3fd320e 100644 --- a/configure.ac +++ b/configure.ac @@ -2659,6 +2659,7 @@ WINE_CONFIG_DLL(mshtml,,[implib,po]) WINE_CONFIG_TEST(dlls/mshtml/tests) WINE_CONFIG_DLL(msi,,[implib,po]) WINE_CONFIG_TEST(dlls/msi/tests) +WINE_CONFIG_DLL(msident) WINE_CONFIG_DLL(msimg32,,[implib]) WINE_CONFIG_DLL(msimsg) WINE_CONFIG_DLL(msimtf) diff --git a/dlls/msident/Makefile.in b/dlls/msident/Makefile.in new file mode 100644 index 0000000..e52a4c8 --- /dev/null +++ b/dlls/msident/Makefile.in @@ -0,0 +1,6 @@ +MODULE = msident.dll + +C_SRCS = \ + msident.c + +@MAKE_DLL_RULES@ diff --git a/dlls/msident/msident.c b/dlls/msident/msident.c new file mode 100644 index 0000000..d6c9935 --- /dev/null +++ b/dlls/msident/msident.c @@ -0,0 +1,61 @@ +/* + * Copyright 2012 Jacek Caban for CodeWeavers + * + * 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 + */ + +#define COBJMACROS + +#include "windows.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msident); + +/****************************************************************** + * DllMain (msident.@) + */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllGetClassObject (msident.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow (msident.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} diff --git a/dlls/msident/msident.spec b/dlls/msident/msident.spec new file mode 100644 index 0000000..079117d --- /dev/null +++ b/dlls/msident/msident.spec @@ -0,0 +1,2 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr)

1 0

Jacek Caban : mshtml: Recognize UTF-8 BOM.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: c17015d10a460427bb3516c9b24b582c2df0b322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c17015d10a460427bb3516c9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 9 10:51:48 2012 +0100 mshtml: Recognize UTF-8 BOM. --- dlls/mshtml/navigate.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 69329c4..d3070b0 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -44,6 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define CONTENT_LENGTH "Content-Length" +#define UTF8_STR "utf-8" #define UTF16_STR "utf-16" static const WCHAR emptyW[] = {0}; @@ -1092,6 +1093,11 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) && (BYTE)This->nsstream->buf[0] == 0xff && (BYTE)This->nsstream->buf[1] == 0xfe) This->nschannel->charset = heap_strdupA(UTF16_STR); + if(This->nsstream->buf_size >= 3 + && (BYTE)This->nsstream->buf[0] == 0xef + && (BYTE)This->nsstream->buf[1] == 0xbb + && (BYTE)This->nsstream->buf[2] == 0xbf) + This->nschannel->charset = heap_strdupA(UTF8_STR); if(!This->nschannel->content_type) { WCHAR *mime;

1 0

Nikolay Sivov : msxml3: Add stub ISAXAttributes for MXAttributes implementation.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: c2d792475b448b5cd51c1f806dddd4b297a28e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2d792475b448b5cd51c1f806… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 9 11:55:03 2012 +0300 msxml3: Add stub ISAXAttributes for MXAttributes implementation. --- dlls/msxml3/mxwriter.c | 154 +++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/saxreader.c | 37 ++++++---- 2 files changed, 175 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2d792475b448b5cd51c1…

1 0

Nikolay Sivov : msxml3: Stub support for IMXAttributes.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: d69afaa95dd26f742694a959d07e8f47c09edcd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d69afaa95dd26f742694a959d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 8 23:11:45 2012 +0300 msxml3: Stub support for IMXAttributes. --- dlls/msxml3/factory.c | 14 +++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/mxwriter.c | 236 +++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/saxreader.c | 42 +++++++- 4 files changed, 291 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d69afaa95dd26f742694a…

1 0

André Hentschel : winemaker: Abort on unhandled file formats.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: fc9670306069afea5856726f7102f1c5c9c59218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc9670306069afea5856726f7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 22:29:29 2012 +0100 winemaker: Abort on unhandled file formats. --- tools/winemaker | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index b6e5e7c..80305d1 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -977,6 +977,9 @@ sub source_scan_project_file($$$) push @{@$project_settings[$T_CEXTRA]},$prj_target_cflags; push @{@$project_settings[$T_CXXEXTRA]},$prj_target_cflags; push @{@$project_settings[$T_DEFINES]},$prj_target_defines; + } else { + print STDERR "File format not supported for file: $filename\n"; + return; } # Add this project to the project list, except for

1 0

André Hentschel : winedbg: Use copy of be_i386_fetch_float for be_arm_fetch_float ( except of long double).
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: a948c20151197996b3668c49df123b40d743b3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a948c20151197996b3668c49d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 22:28:26 2012 +0100 winedbg: Use copy of be_i386_fetch_float for be_arm_fetch_float (except of long double). --- programs/winedbg/be_arm.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 0bd5601..c39043c 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -237,8 +237,20 @@ static int be_arm_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, static int be_arm_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, long double* ret) { - dbg_printf("be_arm_fetch_float: not done\n"); - return FALSE; + char tmp[sizeof(long double)]; + + /* FIXME: this assumes that debuggee and debugger use the same + * representation for reals + */ + if (!memory_read_value(lvalue, size, tmp)) return FALSE; + + switch (size) + { + case sizeof(float): *ret = *(float*)tmp; break; + case sizeof(double): *ret = *(double*)tmp; break; + default: return FALSE; + } + return TRUE; } struct backend_cpu be_arm =

1 0

André Hentschel : dbghelp: Silence arm_fetch_minidump_module.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: 84a036a435c86e3a75d185fa0cbd3ffed38fec9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a036a435c86e3a75d185fa0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 22:27:54 2012 +0100 dbghelp: Silence arm_fetch_minidump_module. --- dlls/dbghelp/cpu_arm.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index eeb8984..a38afe8 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -238,7 +238,9 @@ static BOOL arm_fetch_minidump_thread(struct dump_context* dc, unsigned index, u static BOOL arm_fetch_minidump_module(struct dump_context* dc, unsigned index, unsigned flags) { - FIXME("NIY\n"); + /* FIXME: actually, we should probably take care of FPO data, unless it's stored in + * function table minidump stream + */ return FALSE; }

1 0

André Hentschel : dbghelp: Add arm_fetch_minidump_thread implementation.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: 138cb84be0f693d52dd6cb6ef638c0a81747682a URL: http://source.winehq.org/git/wine.git/?a=commit;h=138cb84be0f693d52dd6cb6ef… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 22:27:07 2012 +0100 dbghelp: Add arm_fetch_minidump_thread implementation. --- dlls/dbghelp/cpu_arm.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index 2712db4..eeb8984 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -224,8 +224,16 @@ static const char* arm_fetch_regname(unsigned regno) static BOOL arm_fetch_minidump_thread(struct dump_context* dc, unsigned index, unsigned flags, const CONTEXT* ctx) { - FIXME("NIY\n"); - return FALSE; + if (ctx->ContextFlags && (flags & ThreadWriteInstructionWindow)) + { + /* FIXME: crop values across module boundaries, */ +#ifdef __arm__ + ULONG base = ctx->Pc <= 0x80 ? 0 : ctx->Pc - 0x80; + minidump_add_memory_block(dc, base, ctx->Pc + 0x80 - base, 0); +#endif + } + + return TRUE; } static BOOL arm_fetch_minidump_module(struct dump_context* dc, unsigned index, unsigned flags)

1 0

Andrew Eikum : mciqtz: Actually assign result to the output structure.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: ad175df21a26cb9c76537a1198c98534f1a1913e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad175df21a26cb9c76537a119… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Mar 8 15:08:41 2012 -0600 mciqtz: Actually assign result to the output structure. --- dlls/mciqtz32/mciqtz.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 03f6f9d..3e16235 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -653,11 +653,11 @@ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMS LONG state = State_Stopped; IMediaControl_GetState(wma->pmctrl, -1, &state); if (state == State_Stopped) - state = MCI_MODE_STOP; + lpParms->dwReturn = MCI_MODE_STOP; else if (state == State_Running) - state = MCI_MODE_PLAY; + lpParms->dwReturn = MCI_MODE_PLAY; else if (state == State_Paused) - state = MCI_MODE_PAUSE; + lpParms->dwReturn = MCI_MODE_PAUSE; break; } case MCI_STATUS_MEDIA_PRESENT:

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
71
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 March 2012