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

Aric Stewart : imm32: Additional constants needed for the IME implementation.
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: 1262ba2c6255815bec20943f060f7fe30030655f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1262ba2c6255815bec20943f0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 6 11:36:09 2007 -0500 imm32: Additional constants needed for the IME implementation. --- include/ddk/imm.h | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/include/ddk/imm.h b/include/ddk/imm.h index 15bf7bc..57b6c7d 100644 --- a/include/ddk/imm.h +++ b/include/ddk/imm.h @@ -95,6 +95,32 @@ DWORD WINAPI ImmGetIMCCLockCount(HIMCC); HIMCC WINAPI ImmReSizeIMCC(HIMCC, DWORD); DWORD WINAPI ImmGetIMCCSize(HIMCC); +/* IME Property bits */ +#define IME_PROP_END_UNLOAD 0x0001 +#define IME_PROP_KBD_CHAR_FIRST 0x0002 +#define IME_PROP_IGNORE_UPKEYS 0x0004 +#define IME_PROP_NEED_ALTKEY 0x0008 +#define IME_PROP_NO_KEYS_ON_CLOSE 0x0010 + +/* for NI_CONTEXTUPDATED */ +#define IMC_SETCONVERSIONMODE 0x0002 +#define IMC_SETSENTENCEMODE 0x0004 +#define IMC_SETOPENSTATUS 0x0006 + +/* dwAction for ImmNotifyIME */ +#define NI_CONTEXTUPDATED 0x0003 +#define NI_OPENCANDIDATE 0x0010 +#define NI_CLOSECANDIDATE 0x0011 +#define NI_SELECTCANDIDATESTR 0x0012 +#define NI_CHANGECANDIDATELIST 0x0013 +#define NI_FINALIZECONVERSIONRESULT 0x0014 +#define NI_COMPOSITIONSTR 0x0015 +#define NI_SETCANDIDATE_PAGESTART 0x0016 +#define NI_SETCANDIDATE_PAGESIZE 0x0017 +#define NI_IMEMENUSELECTED 0x0018 + +BOOL WINAPI ImmGenerateMessage(HIMC); + #ifdef __cplusplus } /* extern "C" */ #endif

1 0

Kirill K. Smirnov : winecfg: Values list should be NULL-terminated.
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: eebfb5c5a2b286e44599d69baa5b7f5d134924aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=eebfb5c5a2b286e44599d69ba… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Mon Aug 6 19:07:31 2007 +0400 winecfg: Values list should be NULL-terminated. --- programs/winecfg/winecfg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 1a19888..a3e5e07 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -638,6 +638,7 @@ char **enumerate_values(HKEY root, char *path) lstrlenW(wret[i]) + 1, NULL, NULL); HeapFree(GetProcessHeap(), 0, wret[i]); } + ret[len] = NULL; } HeapFree(GetProcessHeap(), 0, wpath);

1 0

Roderick Colenbrander : wined3d: Use UINT instead of uint.
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: f3af04a8be2f8c1e23ce3760d0a834c0329002e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3af04a8be2f8c1e23ce3760d… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Aug 6 16:38:00 2007 +0200 wined3d: Use UINT instead of uint. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0759606..65c5382 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1890,7 +1890,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_DESTROYSURFACEFN D3DCB_DestroyDepthStencilSurface, D3DCB_DESTROYSWAPCHAINFN D3DCB_DestroySwapChain) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; int sampler; - uint i; + UINT i; TRACE("(%p)\n", This); if(!This->d3d_initialized) return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 22c18ca..548c337 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -680,7 +680,7 @@ struct IWineD3DDeviceImpl WINED3DDEVTYPE devType; IWineD3DSwapChain **swapchains; - uint NumberOfSwapChains; + UINT NumberOfSwapChains; ResourceList *resources; /* a linked list to track resources created by the device */

1 0

Peter Beutner : msvcrt: Fix _makepath().
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: 1a688cd058e38dde7b5f1978fe564facd48f22a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a688cd058e38dde7b5f1978f… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Mon Aug 6 15:38:49 2007 +0200 msvcrt: Fix _makepath(). --- dlls/msvcrt/dir.c | 26 ++++++++++++++------------ dlls/msvcrt/tests/dir.c | 3 +-- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 21a3115..8340d28 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -853,7 +853,7 @@ VOID CDECL _makepath(char * path, const char * drive, const char *directory, const char * filename, const char * extension) { - char ch; + char *p = path; TRACE("(%s %s %s %s)\n", debugstr_a(drive), debugstr_a(directory), debugstr_a(filename), debugstr_a(extension) ); @@ -861,28 +861,30 @@ VOID CDECL _makepath(char * path, const char * drive, if ( !path ) return; - path[0] = '\0'; if (drive && drive[0]) { - path[0] = drive[0]; - path[1] = ':'; - path[2] = 0; + *p++ = drive[0]; + *p++ = ':'; + *p = 0; } if (directory && directory[0]) { - strcat(path, directory); - ch = path[strlen(path)-1]; - if (ch != '/' && ch != '\\') - strcat(path,"\\"); + strcpy(p, directory); + p += strlen(directory) - 1; + if (*p != '/' && *p != '\\') { + strcat(p, "\\"); + p++; + } + p++; } if (filename && filename[0]) { - strcat(path, filename); + strcpy(p, filename); if (extension && extension[0]) { if ( extension[0] != '.' ) - strcat(path,"."); - strcat(path,extension); + strcat(p,"."); + strcat(p,extension); } } TRACE("returning %s\n",path); diff --git a/dlls/msvcrt/tests/dir.c b/dlls/msvcrt/tests/dir.c index f3c4d08..6929a76 100644 --- a/dlls/msvcrt/tests/dir.c +++ b/dlls/msvcrt/tests/dir.c @@ -43,8 +43,7 @@ static void test_makepath(void) /* this works with native and e.g. Freelancer depends on it */ strcpy(buffer, "foo"); _makepath(buffer, NULL, buffer, "dummy.txt", NULL); - todo_wine { ok( strcmp(buffer, "foo\\dummy.txt") == 0, - "unexpected result: %s\n", buffer); } + ok( strcmp(buffer, "foo\\dummy.txt") == 0, "unexpected result: %s\n", buffer); } static void test_fullpath(void)

1 0

Roderick Colenbrander : wined3d: Don' t call ActivateContext between ENTER_GL/LEAVE_GL.
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: e77da5ef8ac09dc40acf25783fd39617ff32e51c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e77da5ef8ac09dc40acf25783… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Aug 6 16:27:08 2007 +0200 wined3d: Don't call ActivateContext between ENTER_GL/LEAVE_GL. --- dlls/wined3d/basetexture.c | 2 +- dlls/wined3d/context.c | 2 ++ dlls/wined3d/cubetexture.c | 2 -- dlls/wined3d/device.c | 28 +++++++++++++++------------- dlls/wined3d/drawprim.c | 8 +++++--- dlls/wined3d/indexbuffer.c | 4 ++-- dlls/wined3d/surface.c | 19 ++++++++----------- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 2 -- dlls/wined3d/vertexbuffer.c | 8 ++++---- dlls/wined3d/volumetexture.c | 2 +- 11 files changed, 39 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e77da5ef8ac09dc40acf2…

1 0

Peter Beutner : msvcrt: Add _makepath() tests.
by Alexandre Julliard 07 Aug '07

07 Aug '07

Module: wine Branch: master Commit: 2b3c19fe55b24df002a4bcf3f754bc586631fd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b3c19fe55b24df002a4bcf3f… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Mon Aug 6 15:34:20 2007 +0200 msvcrt: Add _makepath() tests. --- dlls/msvcrt/tests/dir.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/dir.c b/dlls/msvcrt/tests/dir.c index 009cbdb..f3c4d08 100644 --- a/dlls/msvcrt/tests/dir.c +++ b/dlls/msvcrt/tests/dir.c @@ -31,6 +31,22 @@ #include <process.h> #include <errno.h> +static void test_makepath(void) +{ + char buffer[MAX_PATH]; + + _makepath(buffer, "C", "\\foo", "dummy", "txt"); + ok( strcmp(buffer, "C:\\foo\\dummy.txt") == 0, "unexpected result: %s\n", buffer); + _makepath(buffer, "C:", "\\foo\\", "dummy", ".txt"); + ok( strcmp(buffer, "C:\\foo\\dummy.txt") == 0, "unexpected result: %s\n", buffer); + + /* this works with native and e.g. Freelancer depends on it */ + strcpy(buffer, "foo"); + _makepath(buffer, NULL, buffer, "dummy.txt", NULL); + todo_wine { ok( strcmp(buffer, "foo\\dummy.txt") == 0, + "unexpected result: %s\n", buffer); } +} + static void test_fullpath(void) { char full[MAX_PATH]; @@ -91,4 +107,5 @@ static void test_fullpath(void) START_TEST(dir) { test_fullpath(); + test_makepath(); }

1 0

lostwages/templates/en download.template
by Jeremy Newman 06 Aug '07

06 Aug '07

ChangeSet ID: 31318 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/08/06 15:59:31 Modified files: templates/en : download.template Log message: add links to Mac and Linux versions of CrossOver Patch: http://cvs.winehq.org/patch.py?id=31318 Old revision New revision Changes Path 1.93 1.94 +4 -1 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.93 lostwages/templates/en/download.template:1.94 --- lostwages/templates/en/download.template:1.93 6 Aug 2007 20:59:31 -0000 +++ lostwages/templates/en/download.template 6 Aug 2007 20:59:31 -0000 @@ -141,7 +141,10 @@ for post-installation instructions.< </td> <td align=left bgcolor="#ffffff"> <a href="http://www.codeweavers.com/products/">CrossOver</a> - - Award winning highly customized versions for Mac OS X and Linux. Easy to use GUI tools to configure to work with + Award winning highly customized versions for + <a href="http://www.codeweavers.com/products/cxmac/">Mac OS</a> and + <a href="http://www.codeweavers.com/products/cxoffice/">Linux</a>. + Easy to use GUI tools to configure to work with supported applications such as Microsoft® Office, Adobe® Photoshop, Lotus Notes®, and DirectX/OpenGL games. Email support available after purchase. Multi-user server version also available. <a href="http://www.codeweavers.com/products/download_trial/">Evaluation versions available</a>.

1 0

tools/winetest gather
by Jeremy Newman 06 Aug '07

06 Aug '07

ChangeSet ID: 31317 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/08/06 13:30:50 Modified files: winetest : gather Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> Show missing dll's in the single/group results Patch: http://cvs.winehq.org/patch.py?id=31317 Old revision New revision Changes Path 1.22 1.23 +18 -3 tools/winetest/gather Index: tools/winetest/gather diff -u -p tools/winetest/gather:1.22 tools/winetest/gather:1.23 --- tools/winetest/gather:1.22 6 Aug 2007 18:30:50 -0000 +++ tools/winetest/gather 6 Aug 2007 18:30:50 -0000 @@ -97,7 +97,8 @@ foreach my $file (glob "$datadir/$build/ $source, $rev) = split; my $testname = "$unit:$test"; if ($test =~ /_dll_missing/) { - # Skip these tests for now + # Mark the dll as missing on this system + $testref->{dllmissing}->{$unit} = $unit; next; } $testref->{results}->{$testname} = [$count, $todo, $error, $skipped]; @@ -130,8 +131,14 @@ foreach my $group (@groups) { if (!exists $test->{results}->{$testname}) { # Make sure missing tests are shown in the group results $group->{digests}->{$testname} = "differ"; - # Mark this test as missing for an unknown reason - $test->{results}->{$testname} = ["test missing", "-", "-", "-"]; + my ($dll, $subtest) = split(/:/, $testname); + if (exists $test->{dllmissing}->{$dll}) { + # Mark this test as missing because of a missing dll + $test->{results}->{$testname} = ["dll missing", "-", "-", "-"]; + } else { + # Mark this test as missing for an unknown reason + $test->{results}->{$testname} = ["test missing", "-", "-", "-"]; + } } } } @@ -224,6 +231,14 @@ sub singletest { $todo == 258?"timeout":"failed"; my $fail = -r "$datadir/$build/$file"?"<a href=\"$file\">$msg</a>":$msg; print OUT " <td class=\"note\">$fail</td>\n"; + } elsif ($count eq "dll missing") { + my ($dll, $subtest) = split(/:/, $testname); + print OUT <<"EOF"; + <td class="skip_pass"><a + title="No tests run as $dll.dll is not present on this system" + onMouseOver="No tests run as $dll.dll is not present on this system" + >0</a></td> +EOF } elsif ($count eq "test missing") { print OUT <<"EOF"; <td class="skip_fail"><a

1 0

tools/winetest gather
by Jeremy Newman 06 Aug '07

06 Aug '07

ChangeSet ID: 31316 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/08/06 10:49:32 Modified files: winetest : gather Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> Show missing tests in summary/group results Patch: http://cvs.winehq.org/patch.py?id=31316 Old revision New revision Changes Path 1.21 1.22 +33 -15 tools/winetest/gather Index: tools/winetest/gather diff -u -p tools/winetest/gather:1.21 tools/winetest/gather:1.22 --- tools/winetest/gather:1.21 6 Aug 2007 15:49:32 -0000 +++ tools/winetest/gather 6 Aug 2007 15:49:32 -0000 @@ -121,6 +121,22 @@ foreach my $file (glob "$datadir/$build/ push @{$group->{tests}}, $testref; } +# Find missing tests. After this exercise all testresults (correct, failed and missing) are available +# for all systems. +foreach my $group (@groups) { + next unless exists $group->{tests}; + foreach my $test (@{$group->{tests}}) { + foreach my $testname (sort keys %alltests) { + if (!exists $test->{results}->{$testname}) { + # Make sure missing tests are shown in the group results + $group->{digests}->{$testname} = "differ"; + # Mark this test as missing for an unknown reason + $test->{results}->{$testname} = ["test missing", "-", "-", "-"]; + } + } + } +} + # Write out the tables my ($header); # same in thead and tfoot @@ -201,28 +217,30 @@ EOF # Output a single cell of a test sub singletest { my ($test, $testname, $groupname) = @_; - - if (!exists $test->{results}->{$testname}) { - print OUT " <td class=\"note\">.</td>\n"; + my $file = "$test->{dir}/$testname.txt"; + my ($count, $todo, $error, $skipped) = @{$test->{results}->{$testname}}; + if ($count eq "failed") { + my $msg = $todo eq "-"?"crash": + $todo == 258?"timeout":"failed"; + my $fail = -r "$datadir/$build/$file"?"<a href=\"$file\">$msg</a>":$msg; + print OUT " <td class=\"note\">$fail</td>\n"; + } elsif ($count eq "test missing") { + print OUT <<"EOF"; + <td class="skip_fail"><a + title="Test did not run for an unknown reason" + onMouseOver="Test did not run for an unknown reason"; + >.</a></td> +EOF } else { - my $file = "$test->{dir}/$testname.txt"; - my ($count, $todo, $error, $skipped) = @{$test->{results}->{$testname}}; - if ($count eq "failed") { - my $msg = $todo eq "-"?"crash": - $todo == 258?"timeout":"failed"; - my $fail = -r "$datadir/$build/$file"?"<a href=\"$file\">$msg</a>":$msg; - print OUT " <td class=\"note\">$fail</td>\n"; - } else { - my $class = $error?"fail":"pass"; - my $skip = $skipped?"skip_":""; - print OUT <<"EOF"; + my $class = $error?"fail":"pass"; + my $skip = $skipped?"skip_":""; + print OUT <<"EOF"; <td class="$skip$class"><a href="$file" title="$count tests, $todo TODO, $error errors, $skipped skipped" onMouseOver="refresh('$testname','$groupname $test->{tag}',$count,$todo,$error,$skipped);" >$error</a></td> EOF - } } }

1 0

Vitaliy Margolen : dinput: Reuse common code and definition.
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: b06786940c95e11729438ad6d0cb0bae765d5d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06786940c95e11729438ad6d… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Aug 5 12:24:04 2007 -0600 dinput: Reuse common code and definition. Unify object properties structure and he common axis mapping function for both joystick drivers. --- dlls/dinput/device_private.h | 11 +++ dlls/dinput/joystick_linux.c | 28 +-------- dlls/dinput/joystick_linuxinput.c | 124 +++++++++++++++++++------------------ 3 files changed, 77 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b06786940c95e11729438…

1 0