August 2006 - Wine-commits - list.winehq.org

Mike McCormack : infosoft: Use the pfnFillTextBuffer function to refresh the buffer.
by Alexandre Julliard 11 Aug '06

11 Aug '06

Module: wine Branch: master Commit: c4c35d33b52dcf68c39a5f1caf9aeb77a073845c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c4c35d33b52dcf68c39a5f1… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Aug 11 20:08:25 2006 +0900 infosoft: Use the pfnFillTextBuffer function to refresh the buffer. --- dlls/infosoft/wordbreaker.c | 76 +++++++++++++++++++++++++++++++------------ 1 files changed, 54 insertions(+), 22 deletions(-) diff --git a/dlls/infosoft/wordbreaker.c b/dlls/infosoft/wordbreaker.c index 7b3ac95..89d0b36 100644 --- a/dlls/infosoft/wordbreaker.c +++ b/dlls/infosoft/wordbreaker.c @@ -87,35 +87,67 @@ static HRESULT WINAPI wb_Init( IWordBrea return S_OK; } -static HRESULT WINAPI wb_BreakText( IWordBreaker *iface, - TEXT_SOURCE *pTextSource, IWordSink *pWordSink, IPhraseSink *pPhraseSink) +static HRESULT call_sink( IWordSink *pWordSink, TEXT_SOURCE *ts, UINT len ) { - LPCWSTR p, q; - DWORD len; + HRESULT r; - FIXME("%p %p %p\n", pTextSource, pWordSink, pPhraseSink); + if (!len) + return S_OK; - p = pTextSource->awcBuffer; + TRACE("%d %s\n", len, debugstr_w(&ts->awcBuffer[ts->iCur])); - while (*p) - { - /* skip spaces and punctuation */ - while(ispunctW(*p) || isspaceW(*p)) - p++; + r = IWordSink_PutWord( pWordSink, len, &ts->awcBuffer[ts->iCur], len, ts->iCur ); + ts->iCur += len; + + return r; +} - /* find the end of the word */ - q = p; - while(*q && !ispunctW(*q) && !isspaceW(*q)) - q++; +static HRESULT WINAPI wb_BreakText( IWordBreaker *iface, + TEXT_SOURCE *ts, IWordSink *pWordSink, IPhraseSink *pPhraseSink) +{ + UINT len, state = 0; + WCHAR ch; - len = q - p; - if (!len) - break; + TRACE("%p %p %p\n", ts, pWordSink, pPhraseSink); - IWordSink_PutWord( pWordSink, len, p, len, p - pTextSource->awcBuffer ); + if (pPhraseSink) + FIXME("IPhraseSink won't be called\n"); + + do + { + len = 0; + while ((ts->iCur + len) < ts->iEnd) + { + ch = ts->awcBuffer[ts->iCur + len]; + + switch (state) + { + case 0: /* skip spaces and punctuation */ + + if (!ch || ispunctW(ch) || isspaceW(ch)) + ts->iCur ++; + else + state = 1; + break; + + case 1: /* find the end of the word */ + + if (ch && !ispunctW(ch) && !isspaceW(ch)) + len++; + else + { + call_sink( pWordSink, ts, len ); + len = 0; + state = 0; + } + break; + + } + } + call_sink( pWordSink, ts, len ); + + } while (S_OK == ts->pfnFillTextBuffer( ts )); - p = q; - } return S_OK; } @@ -152,7 +184,7 @@ HRESULT WINAPI wb_Constructor(IUnknown* wordbreaker_impl *This; IWordBreaker *wb; - FIXME("%p %s %p\n", pUnkOuter, debugstr_guid(riid), ppvObject); + TRACE("%p %s %p\n", pUnkOuter, debugstr_guid(riid), ppvObject); This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); if (!This)

1 0

Alexandre Julliard : ntdll: Remove some macros and clean up the code now that all platforms use siginfo .
by Alexandre Julliard 11 Aug '06

11 Aug '06

Module: wine Branch: master Commit: c627cbd765512726f0e0700af14eb717a18c976e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c627cbd765512726f0e0700… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 11 14:45:11 2006 +0200 ntdll: Remove some macros and clean up the code now that all platforms use siginfo. --- dlls/ntdll/signal_i386.c | 221 ++++++++++------------------------------------ 1 files changed, 47 insertions(+), 174 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c627cbd765512726f0e…

1 0

Alexandre Julliard : ntdll: Switch linux to siginfo-style signal handling.
by Alexandre Julliard 11 Aug '06

11 Aug '06

Module: wine Branch: master Commit: 38cf3a43058a6ba5a1f34fe5fd46efe3e270e536 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=38cf3a43058a6ba5a1f34fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 11 14:14:38 2006 +0200 ntdll: Switch linux to siginfo-style signal handling. --- dlls/ntdll/signal_i386.c | 85 ++++++++++++++-------------------------------- 1 files changed, 26 insertions(+), 59 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 2055d93..b115ff6 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -65,60 +65,36 @@ #endif */ #ifdef linux -typedef struct -{ - unsigned short sc_gs, __gsh; - unsigned short sc_fs, __fsh; - unsigned short sc_es, __esh; - unsigned short sc_ds, __dsh; - unsigned long sc_edi; - unsigned long sc_esi; - unsigned long sc_ebp; - unsigned long sc_esp; - unsigned long sc_ebx; - unsigned long sc_edx; - unsigned long sc_ecx; - unsigned long sc_eax; - unsigned long sc_trapno; - unsigned long sc_err; - unsigned long sc_eip; - unsigned short sc_cs, __csh; - unsigned long sc_eflags; - unsigned long esp_at_signal; - unsigned short sc_ss, __ssh; - unsigned long i387; - unsigned long oldmask; - unsigned long cr2; -} volatile SIGCONTEXT; - -#define HANDLER_DEF(name) void name( int __signal, SIGCONTEXT __context ) -#define HANDLER_CONTEXT (&__context) -#define EAX_sig(context) ((context)->sc_eax) -#define EBX_sig(context) ((context)->sc_ebx) -#define ECX_sig(context) ((context)->sc_ecx) -#define EDX_sig(context) ((context)->sc_edx) -#define ESI_sig(context) ((context)->sc_esi) -#define EDI_sig(context) ((context)->sc_edi) -#define EBP_sig(context) ((context)->sc_ebp) - -#define CS_sig(context) ((context)->sc_cs) -#define DS_sig(context) ((context)->sc_ds) -#define ES_sig(context) ((context)->sc_es) -#define FS_sig(context) ((context)->sc_fs) -#define GS_sig(context) ((context)->sc_gs) -#define SS_sig(context) ((context)->sc_ss) - -#define TRAP_sig(context) ((context)->sc_trapno) -#define ERROR_sig(context) ((context)->sc_err) -#define EFL_sig(context) ((context)->sc_eflags) +typedef ucontext_t SIGCONTEXT; -#define EIP_sig(context) ((context)->sc_eip) -#define ESP_sig(context) ((context)->sc_esp) +#define HANDLER_DEF(name) void name( int __signal, siginfo_t *__siginfo, SIGCONTEXT *__context ) +#define HANDLER_CONTEXT __context -#define FPU_sig(context) ((FLOATING_SAVE_AREA*)((context)->i387)) +#define EAX_sig(context) ((context)->uc_mcontext.gregs[REG_EAX]) +#define EBX_sig(context) ((context)->uc_mcontext.gregs[REG_EBX]) +#define ECX_sig(context) ((context)->uc_mcontext.gregs[REG_ECX]) +#define EDX_sig(context) ((context)->uc_mcontext.gregs[REG_EDX]) +#define ESI_sig(context) ((context)->uc_mcontext.gregs[REG_ESI]) +#define EDI_sig(context) ((context)->uc_mcontext.gregs[REG_EDI]) +#define EBP_sig(context) ((context)->uc_mcontext.gregs[REG_EBP]) +#define ESP_sig(context) ((context)->uc_mcontext.gregs[REG_ESP]) + +#define CS_sig(context) ((context)->uc_mcontext.gregs[REG_CS]) +#define DS_sig(context) ((context)->uc_mcontext.gregs[REG_DS]) +#define ES_sig(context) ((context)->uc_mcontext.gregs[REG_ES]) +#define SS_sig(context) ((context)->uc_mcontext.gregs[REG_SS]) +#define FS_sig(context) ((context)->uc_mcontext.gregs[REG_FS]) +#define GS_sig(context) ((context)->uc_mcontext.gregs[REG_GS]) + +#define EFL_sig(context) ((context)->uc_mcontext.gregs[REG_EFL]) +#define EIP_sig(context) ((context)->uc_mcontext.gregs[REG_EIP]) +#define TRAP_sig(context) ((context)->uc_mcontext.gregs[REG_TRAPNO]) +#define ERROR_sig(context) ((context)->uc_mcontext.gregs[REG_ERR]) + +#define FPU_sig(context) ((FLOATING_SAVE_AREA*)((context)->uc_mcontext.fpregs)) -#define FAULT_ADDRESS ((void *)HANDLER_CONTEXT->cr2) +#define FAULT_ADDRESS (__siginfo->si_addr) #define VM86_EAX 0 /* the %eax value while vm86_enter is executing */ @@ -1466,16 +1442,7 @@ #endif /* HAVE_SIGALTSTACK */ sigaddset( &sig_act.sa_mask, SIGINT ); sigaddset( &sig_act.sa_mask, SIGUSR1 ); sigaddset( &sig_act.sa_mask, SIGUSR2 ); - -#if defined(linux) - sig_act.sa_flags = SA_RESTART; -#elif defined (__svr4__) || defined(_SCO_DS) || defined(__APPLE__) || \ - defined(__NetBSD__) || defined(__OpenBSD__) || \ - defined(__FreeBSD__) || defined(__FreeBSD_kernel__) sig_act.sa_flags = SA_SIGINFO | SA_RESTART; -#else - sig_act.sa_flags = 0; -#endif #ifdef SA_ONSTACK sig_act.sa_flags |= SA_ONSTACK;

1 0

Mike McCormack : pstorec: Add a stub implementation.
by Alexandre Julliard 11 Aug '06

11 Aug '06

Module: wine Branch: master Commit: acb7f8abe27c42191cb9774bf16505cb9b8a92ec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=acb7f8abe27c42191cb9774… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Aug 11 15:11:47 2006 +0900 pstorec: Add a stub implementation. --- configure | 3 configure.ac | 1 dlls/Makefile.in | 1 dlls/pstorec/Makefile.in | 14 ++ dlls/pstorec/pstorec.c | 392 +++++++++++++++++++++++++++++++++++++++++++++ dlls/pstorec/pstorec.spec | 7 + 6 files changed, 417 insertions(+), 1 deletions(-) create mode 100644 dlls/pstorec/Makefile.in create mode 100644 dlls/pstorec/pstorec.c create mode 100644 dlls/pstorec/pstorec.spec Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=acb7f8abe27c42191cb…

1 0

Molle Bestefich : bug_report.pl: Use correct 'wine --version' syntax.
by Alexandre Julliard 11 Aug '06

11 Aug '06

Module: wine Branch: master Commit: 9503f6efefffa50d1d9239c7eee43aa8fb7937f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9503f6efefffa50d1d9239c… Author: Molle Bestefich <molle.bestefich(a)gmail.com> Date: Thu Aug 10 22:38:48 2006 +0200 bug_report.pl: Use correct 'wine --version' syntax. --- tools/bug_report.pl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/bug_report.pl b/tools/bug_report.pl index 18f180c..f445c57 100755 --- a/tools/bug_report.pl +++ b/tools/bug_report.pl @@ -425,11 +425,11 @@ if ($debuglevel > 1) { $winever .= " CVS"; } else { - $winever = `$wineloc -v 2>&1`; + $winever = `$wineloc --version 2>&1`; chomp $winever; } } elsif ($debuglevel =~ 1) { - $winever=`$wineloc -v 2>&1`; + $winever=`$wineloc --version 2>&1`; chomp $winever; } my $gccver=`gcc -v 2>&1`;

1 0

Benjamin Arai : oleaut32: Removes stub message from olefont: OLEFontImpl_FindConnectionPoint.
by Alexandre Julliard 11 Aug '06

11 Aug '06

Module: wine Branch: master Commit: 3dade1e7def970bffd0aeac5d34b831e1ea37ed1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3dade1e7def970bffd0aeac… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Thu Aug 10 18:48:37 2006 -0700 oleaut32: Removes stub message from olefont:OLEFontImpl_FindConnectionPoint. --- dlls/oleaut32/olefont.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index ee52a05..ac0bc8f 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -2018,7 +2018,7 @@ static HRESULT WINAPI OLEFontImpl_FindCo IConnectionPoint **ppCp) { OLEFontImpl *this = impl_from_IConnectionPointContainer(iface); - TRACE("(%p)->(%s, %p): stub\n", this, debugstr_guid(riid), ppCp); + TRACE("(%p)->(%s, %p)\n", this, debugstr_guid(riid), ppCp); if(IsEqualIID(riid, &IID_IPropertyNotifySink)) { return IConnectionPoint_QueryInterface(this->pPropertyNotifyCP,

1 0

James Hawkins : msi: Only remove a file if the version to be installed is strictly newer than the old file .
by Alexandre Julliard 11 Aug '06

11 Aug '06

Module: wine Branch: master Commit: 5d37be9e56e9b875142a93a7af0671f2d9bc2947 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d37be9e56e9b875142a93a… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Aug 10 13:53:08 2006 -0700 msi: Only remove a file if the version to be installed is strictly newer than the old file. --- dlls/msi/files.c | 24 ++++++++++++++++++++++++ dlls/msi/tests/package.c | 11 ++++------- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 443e6c3..7f1c4db 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -823,6 +823,24 @@ UINT ACTION_DuplicateFiles(MSIPACKAGE *p return rc; } +/* compares the version of a file read from the filesystem and + * the version specified in the File table + */ +static int msi_compare_file_version( MSIFILE *file ) +{ + WCHAR version[MAX_PATH]; + DWORD size; + UINT r; + + size = MAX_PATH; + version[0] = '\0'; + r = MsiGetFileVersionW( file->TargetPath, version, &size, NULL, NULL ); + if ( r != ERROR_SUCCESS ) + return 0; + + return lstrcmpW( version, file->Version ); +} + UINT ACTION_RemoveFiles( MSIPACKAGE *package ) { MSIFILE *file; @@ -843,6 +861,12 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *pac if ( file->state != msifs_present ) continue; + /* only remove a file if the version to be installed + * is strictly newer than the old file + */ + if ( msi_compare_file_version( file ) >= 0 ) + continue; + TRACE("removing %s\n", debugstr_w(file->File) ); if ( !DeleteFileW( file->TargetPath ) ) ERR("failed to delete %s\n", debugstr_w(file->TargetPath) ); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 3ff7b0f..55b2e1c 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1938,13 +1938,10 @@ static void test_removefiles(void) r = MsiDoAction( hpkg, "RemoveFiles"); ok( r == ERROR_SUCCESS, "remove files failed\n"); - todo_wine - { - ok(DeleteFileA("hydrogen.txt"), "Expected hydrogen.txt to exist\n"); - ok(DeleteFileA("lithium.txt"), "Expected lithium.txt to exist\n"); - ok(DeleteFileA("beryllium.txt"), "Expected beryllium.txt to exist\n"); - ok(DeleteFileA("carbon.txt"), "Expected carbon.txt to exist\n"); - } + ok(DeleteFileA("hydrogen.txt"), "Expected hydrogen.txt to exist\n"); + ok(DeleteFileA("lithium.txt"), "Expected lithium.txt to exist\n"); + ok(DeleteFileA("beryllium.txt"), "Expected beryllium.txt to exist\n"); + ok(DeleteFileA("carbon.txt"), "Expected carbon.txt to exist\n"); ok(DeleteFileA("helium.txt"), "Expected helium.txt to exist\n"); ok(DeleteFileA("boron.txt"), "Expected boron.txt to exist\n");

1 0

Roderick Colenbrander : wined3d: Fix opengl extension call.
by Alexandre Julliard 11 Aug '06

11 Aug '06

Module: wine Branch: master Commit: 1a3359884c73692b30ffa28f88361c27381a1c9f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a3359884c73692b30ffa28… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Aug 11 01:04:24 2006 +0200 wined3d: Fix opengl extension call. --- dlls/wined3d/drawprim.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 434fab9..360efdd 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -859,7 +859,7 @@ static void unloadVertexData(IWineD3DDev glDisableClientState(GL_SECONDARY_COLOR_ARRAY_EXT); } for (texture_idx = 0; texture_idx < GL_LIMITS(textures); ++texture_idx) { - glClientActiveTextureARB(GL_TEXTURE0_ARB + texture_idx); + GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + texture_idx)); glDisableClientState(GL_TEXTURE_COORD_ARRAY); } }

1 0

Hwang YunSong(황윤성) : shell32: Updated Korean resource.
by Alexandre Julliard 11 Aug '06

11 Aug '06

Module: wine Branch: master Commit: a17d253c5db45d7a791eb6d52b36f43998419691 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a17d253c5db45d7a791eb6d… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Fri Aug 11 08:39:29 2006 +0900 shell32: Updated Korean resource. --- dlls/shell32/shell32_Ko.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc index 9d69748..158cf56 100644 --- a/dlls/shell32/shell32_Ko.rc +++ b/dlls/shell32/shell32_Ko.rc @@ -146,10 +146,13 @@ IDS_SHV_COLUMN8 "�̸�" IDS_SHV_COLUMN9 "�ּ�" IDS_SHV_COLUMN10 "��" IDS_SHV_COLUMN11 "�׷�" +IDS_SHV_COLUMN_DELFROM "�� ġ" +IDS_SHV_COLUMN_DELDATE "�� ¥" /* special folders */ IDS_DESKTOP "��ũž" IDS_MYCOMPUTER "�� ǻ��" +IDS_RECYCLEBIN_FOLDER_NAME "��" /* context menus */ IDS_VIEW_LARGE "ū ��(&G)"

1 0

Dan Hipschman : widl: Fix incorrect version number in generated code.
by Alexandre Julliard 11 Aug '06

11 Aug '06

Module: wine Branch: master Commit: a20f7f46dcc032478e966c2301d05002440b8423 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a20f7f46dcc032478e966c2… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Aug 10 16:51:28 2006 -0700 widl: Fix incorrect version number in generated code. --- tools/widl/client.c | 2 +- tools/widl/proxy.c | 2 +- tools/widl/server.c | 2 +- tools/widl/widl.h | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 6f8773e..c52fe98 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -451,7 +451,7 @@ static void init_client(void) if (!(client = fopen(client_name, "w"))) error("Could not open %s for output\n", client_name); - print_client("/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", WIDL_FULLVERSION, input_name); + print_client("/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", PACKAGE_VERSION, input_name); print_client("#include <string.h>\n"); print_client("#ifdef _ALPHA_\n"); print_client("#include <stdarg.h>\n"); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 1710cdc..c308ab8 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -147,7 +147,7 @@ static void init_proxy(void) if (proxy) return; if(!(proxy = fopen(proxy_name, "w"))) error("Could not open %s for output\n", proxy_name); - print_proxy( "/*** Autogenerated by WIDL %s - Do not edit ***/\n", WIDL_FULLVERSION); + print_proxy( "/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", PACKAGE_VERSION, input_name); print_proxy( "\n"); print_proxy( "#ifndef __REDQ_RPCPROXY_H_VERSION__\n"); print_proxy( "#define __REQUIRED_RPCPROXY_H_VERSION__ 440\n"); diff --git a/tools/widl/server.c b/tools/widl/server.c index 72d5ae7..19a4a2b 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -587,7 +587,7 @@ static void init_server(void) if (!(server = fopen(server_name, "w"))) error("Could not open %s for output\n", server_name); - print_server("/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", WIDL_FULLVERSION, input_name); + print_server("/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", PACKAGE_VERSION, input_name); print_server("#include <string.h>\n"); fprintf(server, "\n"); print_server("#include \"%s\"\n", header_name); diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 9357450..e84a5ad 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -25,8 +25,6 @@ #include "widltypes.h" #include <time.h> -#define WIDL_FULLVERSION "0.1" - extern int debuglevel; #define DEBUGLEVEL_NONE 0x0000 #define DEBUGLEVEL_CHAT 0x0001

1 0