wine-commits June 2010

wine-commits@winehq.org

3 participants
663 discussions

Jose Rostagno : start: Fix Spanish translation.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: c5af0b87df460ec562bbd1925c2f318e9bc91f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5af0b87df460ec562bbd1925… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Tue Jun 22 22:16:54 2010 -0300 start: Fix Spanish translation. --- programs/start/Es.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/start/Es.rc b/programs/start/Es.rc index 83881c6..d2f878e 100644 --- a/programs/start/Es.rc +++ b/programs/start/Es.rc @@ -65,5 +65,5 @@ Mire el archivo COPYING.LIB para informaci STRING_EXECFAIL "La aplicaci�n no se pudo ejecutar, o no hay ninguna aplicaci�n asociada con el archivo especificado.\nShellExecuteEx fallido" -STRING_UNIXFAIL "Could not translate the specified Unix filename to a DOS filename." +STRING_UNIXFAIL "No se pudo traducir el nombre de archivo UNIX especificado a un nombre de archivo de DOS." }

1 0

Jose Rostagno : winecfg: Fix Spanish translation.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 2fffa25290f9f67e42cd7c54ea7c9a324eec3a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fffa25290f9f67e42cd7c54e… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Tue Jun 22 22:10:32 2010 -0300 winecfg: Fix Spanish translation. --- programs/winecfg/Es.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index 0b9a8fa..dcf8e37 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -155,7 +155,7 @@ BEGIN COMBOBOX IDC_COMBO_TYPE,45,135,77,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Mostrar avanzado",IDC_BUTTON_SHOW_HIDE_ADVANCED,166,135,80,13 - LTEXT "De&vice:",IDC_STATIC_DEVICE,15,153,26,9 + LTEXT "Dispositi&vo:",IDC_STATIC_DEVICE,15,153,26,9 EDITTEXT IDC_EDIT_DEVICE,45,150,150,13,ES_AUTOHSCROLL | WS_TABSTOP PUSHBUTTON "E&xaminar...",IDC_BUTTON_BROWSE_DEVICE,200,150,46,13

1 0

Jose Rostagno : wineconsole: Fix Spanish translation.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 05472a934453fa42dbb6c364b430ab67db460769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05472a934453fa42dbb6c364b… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Tue Jun 22 22:04:46 2010 -0300 wineconsole: Fix Spanish translation. --- programs/wineconsole/wineconsole_Es.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineconsole/wineconsole_Es.rc b/programs/wineconsole/wineconsole_Es.rc index da6e1fb..7fd8162 100644 --- a/programs/wineconsole/wineconsole_Es.rc +++ b/programs/wineconsole/wineconsole_Es.rc @@ -32,7 +32,7 @@ IDS_MARK, "&Marcar" IDS_COPY, "&Copiar" IDS_PASTE, "&Pegar" IDS_SELECTALL, "&Seleccionar todo" -IDS_SCROLL, "Sc&roll" +IDS_SCROLL, "Desplaza&r" IDS_SEARCH, "&Buscar" IDS_FNT_DISPLAY, "Cada caracter tiene %ld p�xeles de ancho por %ld p�xeles de alto" IDS_FNT_PREVIEW, "Esto es una prueba"

1 0

Dmitry Timoshkov : comctl32: Add a bunch of imagelist storage tests, make them pass under Wine.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 1066194f94b59ba4df249e0dcfa9e0da6e4c6f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1066194f94b59ba4df249e0dc… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 23 17:57:39 2010 +0900 comctl32: Add a bunch of imagelist storage tests, make them pass under Wine. --- dlls/comctl32/imagelist.c | 8 +- dlls/comctl32/tests/imagelist.c | 187 +++++++++++++++++++++++++++++++------- 2 files changed, 156 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1066194f94b59ba4df249…

1 0

Hans Leidekker : msi: Avoid a crash when the cabinet file must be downloaded.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 2c20c35d3ca35e0c516658f22415b83c9c67ece7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c20c35d3ca35e0c516658f22… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 23 10:44:26 2010 +0200 msi: Avoid a crash when the cabinet file must be downloaded. Fixes a regression caused by e5869d5d5c8f01b140ac5fba1044f3c10975612c. --- dlls/msi/media.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index b455775..6dc262c 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -785,13 +785,17 @@ UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) { WCHAR temppath[MAX_PATH], *p; - msi_download_file(cabinet_file, temppath); + rc = msi_download_file(cabinet_file, temppath); + if (rc != ERROR_SUCCESS) + { + ERR("Failed to download %s (%u)\n", debugstr_w(cabinet_file), rc); + msi_free(cabinet_file); + return rc; + } if ((p = strrchrW(temppath, '\\'))) *p = 0; - - msi_free(mi->sourcedir); strcpyW(mi->sourcedir, temppath); msi_free(mi->cabinet); - strcpyW(mi->cabinet, p + 1); + mi->cabinet = strdupW(p + 1); msi_free(cabinet_file); return ERROR_SUCCESS;

1 0

Michael Stefaniuc : msvfw32: Add the Romanian translation.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: d22e3e4324af139c5da9c082a16223c0a444ef58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d22e3e4324af139c5da9c082a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 23 13:09:54 2010 +0200 msvfw32: Add the Romanian translation. Translation by Claudia Cotună. --- dlls/msvfw32/Makefile.in | 1 + dlls/msvfw32/msvfw32_Ro.rc | 57 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in index 292e345..e431ce5 100644 --- a/dlls/msvfw32/Makefile.in +++ b/dlls/msvfw32/Makefile.in @@ -25,6 +25,7 @@ RC_SRCS = \ msvfw32_No.rc \ msvfw32_Pl.rc \ msvfw32_Pt.rc \ + msvfw32_Ro.rc \ msvfw32_Ru.rc \ msvfw32_Si.rc \ msvfw32_Sv.rc \ diff --git a/dlls/msvfw32/msvfw32_Ro.rc b/dlls/msvfw32/msvfw32_Ro.rc new file mode 100644 index 0000000..69527b0 --- /dev/null +++ b/dlls/msvfw32/msvfw32_Ro.rc @@ -0,0 +1,57 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2010 Claudia Cotună + * Michael Stefaniuc + * + * 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 + */ + +#include "msvideo_private.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 200, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Compresie video" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK",IDOK,140,2,51,14 + PUSHBUTTON "Renunță",IDCANCEL,140,18,51,14 + + LTEXT "&Compresor:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "Con&figurare...",882,140,36,51,14 + PUSHBUTTON "&Despre...",883,140,52,51,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "Ca&litatea compresiei:",886,9,34,80,8 + + CONTROL "Cadru c&heie la fiecare",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,82,12 + EDITTEXT 888,93,60,22,12 + LTEXT "cadre",889,118,62,22,10 + + CONTROL "Rata de &date",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,70,12 + EDITTEXT 895,93,76,22,12 + LTEXT "KO/sec",896,118,78,22,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Cadre întregi (necomprimate)" +}

1 0

Michael Stefaniuc : notepad: Fix an error in the Chinese (Simplified) resource.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 98c2a1ee816f5e2b0263e6fb3a828e256f164e26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98c2a1ee816f5e2b0263e6fb3… Author: Michael Stefaniuc <mstefani(a)redhat.com> Date: Wed Jun 23 11:13:16 2010 +0200 notepad: Fix an error in the Chinese (Simplified) resource. Translation by Donald Park. --- programs/notepad/Zh.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Zh.rc b/programs/notepad/Zh.rc index 005c67d..242eb65 100644 --- a/programs/notepad/Zh.rc +++ b/programs/notepad/Zh.rc @@ -55,6 +55,7 @@ POPUP "编辑(&E)" { POPUP "搜索(&S)" { MENUITEM "搜索(&S)...", CMD_SEARCH MENUITEM "搜索下一个(&S)\tF3", CMD_SEARCH_NEXT + MENUITEM "替换...\tCtrl+H", CMD_REPLACE } POPUP "帮助(&H)" { MENUITEM "内容(&C)", CMD_HELP_CONTENTS

1 0

Michael Stefaniuc : notepad: Fix an error in the Wallon resource.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: bd007372d26c0aa43b9241029e845de7fec7b2e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd007372d26c0aa43b9241029… Author: Michael Stefaniuc <mstefani(a)redhat.com> Date: Wed Jun 23 11:13:01 2010 +0200 notepad: Fix an error in the Wallon resource. Translation by David Estebanez. --- programs/notepad/Wa.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Wa.rc b/programs/notepad/Wa.rc index 1856490..85c49c5 100644 --- a/programs/notepad/Wa.rc +++ b/programs/notepad/Wa.rc @@ -57,6 +57,7 @@ POPUP "&Candj POPUP "C&wer�" { MENUITEM "Cwer�...", CMD_SEARCH MENUITEM "&Sh�vant\tF3", CMD_SEARCH_NEXT + MENUITEM "&Replaec�...\tCtrl+H", CMD_REPLACE } POPUP "&Aide" { MENUITEM "�&dvins", CMD_HELP_CONTENTS

1 0

Michael Stefaniuc : net: Add the Romanian translation.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: dbf5ec01aea564bf230da144fc4b714962a12915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbf5ec01aea564bf230da144f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 23 10:34:21 2010 +0200 net: Add the Romanian translation. Translation by Claudia Cotună. --- programs/net/Makefile.in | 1 + programs/net/Ro.rc | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in index 5c06bb8..5efbef0 100644 --- a/programs/net/Makefile.in +++ b/programs/net/Makefile.in @@ -21,6 +21,7 @@ RC_SRCS = \ No.rc \ Pl.rc \ Pt.rc \ + Ro.rc \ Ru.rc \ Si.rc diff --git a/programs/net/Ro.rc b/programs/net/Ro.rc new file mode 100644 index 0000000..9dc52f7 --- /dev/null +++ b/programs/net/Ro.rc @@ -0,0 +1,48 @@ +/* + * NET.EXE - Wine-compatible net program + * + * Copyright (C) 2007 Tim Schwartz + * Copyright (C) 2010 Claudia Cotună + * Michael Stefaniuc + * + * 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 + */ + +#include "resources.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE +{ + STRING_USAGE, "Sintaxa acestei comenzi este:\n\nNET [ HELP | START | STOP | USE ]\n" + STRING_START_USAGE, "Specificați numele serviciului de pornit.\n" + STRING_STOP_USAGE, "Specificați numele serviciului de oprit.\n" + STRING_STOP_DEP, "Se oprește serviciul dependent: %s\n" + STRING_CANT_STOP, "Serviciul %s nu a putut fi oprit\n" + STRING_NO_SCM, "Nu a putut fi accesat managerul de control al serviciului.\n" + STRING_NO_SVCHANDLE, "Serviciul nu a putut fi accesat.\n" + STRING_START_SVC, "Serviciul %s pornește.\n" + STRING_START_SVC_SUCCESS, "Serviciul %s a fost pornit cu succes.\n" + STRING_START_SVC_FAIL, "Pornirea serviciului %s a eșuat.\n" + STRING_STOP_SVC, "Serviciul %s se oprește.\n" + STRING_STOP_SVC_SUCCESS, "Serviciul %s a fost oprit cu succes.\n" + STRING_STOP_SVC_FAIL, "Oprirea serviciului %s a eșuat.\n" + STRING_HELP_USAGE, "Sintaxa acestei comenzi este:\n\ncomandă NET HELP\n -sau-\ncomandă NET /HELP\n\n Comenzile disponibile sunt:\n NET HELP NET START NET STOP NET USE\n" + STRING_NO_ENTRIES, "Nu există nici un element în listă.\n" + STRING_USE_HEADER, "\nStare Local Distant\n---------------------------------------------------------------\n" + STRING_USE_ENTRY, "%s %S %S Resurse deschise: %lu\n" +}

1 0

Alexandre Julliard : user32/tests: Fix some DDE test failures on Win9x.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: fe161ec2f906c62c4e718770cc479b4af1744887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe161ec2f906c62c4e718770c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 23 15:22:29 2010 +0200 user32/tests: Fix some DDE test failures on Win9x. --- dlls/user32/tests/dde.c | 60 ++++++++++++++++++++++++++++++---------------- 1 files changed, 39 insertions(+), 21 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 040c11a..8ead6d2 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -162,7 +162,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA lstrcpyA((LPSTR)data->Value, str); GlobalUnlock(hglobal); - lparam = PackDDElParam(WM_DDE_ACK, (UINT_PTR)hglobal, HIWORD(lparam)); + lparam = PackDDElParam(WM_DDE_DATA, (UINT_PTR)hglobal, HIWORD(lparam)); PostMessageA(client, WM_DDE_DATA, (WPARAM)hwnd, lparam); break; @@ -188,7 +188,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA if (msg_index == 5) { size = GlobalSize((HGLOBAL)lo); - ok(size == 4, "got %d\n", size); + ok(size == 4 || broken(size == 32), /* sizes are rounded up on win9x */ "got %d\n", size); } else ok(!lstrcmpA((LPSTR)poke->Value, "poke data\r\n"), @@ -230,6 +230,11 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA break; } + case WM_DDE_ACK: /* happens on win9x when fAckReq is TRUE, ignore it */ + ok(msg_index == 4, "Expected 4, got %d\n", msg_index); + msg_index--; + break; + default: ok(FALSE, "Unhandled msg: %08x\n", msg); } @@ -300,14 +305,15 @@ static void test_ddeml_client(void) hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); ret = DdeGetLastError(client_pid); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); - ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %08x\n", res); - if (hdata == NULL) - ok(FALSE, "hdata is NULL\n"); - else + ok(res == DDE_FNOTPROCESSED || broken(res == 0xdeadbeef), /* win9x */ + "Expected DDE_FNOTPROCESSED, got %08x\n", res); + ok( hdata != NULL, "hdata is NULL\n" ); + if (hdata) { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19, "Expected 19, got %d\n", size); + ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */ + "Expected 19, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -318,16 +324,18 @@ static void test_ddeml_client(void) DdeGetLastError(client_pid); hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); ret = DdeGetLastError(client_pid); - ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res); + ok(res == DDE_FNOTPROCESSED || broken(res == 0xdeadbeef), /* win9x */ + "Expected DDE_FNOTPROCESSED, got %x\n", res); todo_wine - ok(ret == DMLERR_MEMORY_ERROR, "Expected DMLERR_MEMORY_ERROR, got %d\n", ret); - if (hdata == NULL) - ok(FALSE, "hdata is NULL\n"); - else + ok(ret == DMLERR_MEMORY_ERROR || broken(ret == 0), /* win9x */ + "Expected DMLERR_MEMORY_ERROR, got %d\n", ret); + ok( hdata != NULL, "hdata is NULL\n" ); + if (hdata) { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19, "Expected 19, got %d\n", size); + ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */ + "Expected 19, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -339,14 +347,16 @@ todo_wine hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); ret = DdeGetLastError(client_pid); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); - ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res); + ok(res == DDE_FNOTPROCESSED || broken(res == 0xdeadbeef), /* win9x */ + "Expected DDE_FNOTPROCESSED, got %x\n", res); if (hdata == NULL) ok(FALSE, "hdata is NULL\n"); else { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19, "Expected 19, got %d\n", size); + ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */ + "Expected 19, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -394,7 +404,7 @@ todo_wine op = DdeClientTransaction((LPBYTE)hdata, 0, conversation, item, CF_TEXT, XTYP_POKE, default_timeout, &res); ret = DdeGetLastError(client_pid); ok(op == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", op); - ok(res == DDE_FACK, "Expected DDE_FACK, got %d\n", res); + ok(res == DDE_FACK || broken(res == 0xdeadbeef), /* win9x */ "Expected DDE_FACK, got %x\n", res); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); /* XTYP_POKE, correct params */ @@ -403,7 +413,8 @@ todo_wine op = DdeClientTransaction((LPBYTE)hdata, -1, conversation, item, CF_TEXT, XTYP_POKE, default_timeout, &res); ret = DdeGetLastError(client_pid); ok(op == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", op); - ok(res == DDE_FACK, "Expected DDE_FACK, got %d\n", res); + ok(res == DDE_FACK || broken(res == (0xdead0000 | DDE_FACK)), /* win9x */ + "Expected DDE_FACK, got %x\n", res); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); DdeFreeDataHandle(hdata); @@ -420,7 +431,7 @@ todo_wine ret = DdeGetLastError(client_pid); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); ok(op == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", op); - ok(res == DDE_FACK, "Expected DDE_FACK, got %d\n", res); + ok(res == DDE_FACK || broken(res == 0xdeadbeef), /* win9x */ "Expected DDE_FACK, got %x\n", res); /* XTYP_EXECUTE, no data */ res = 0xdeadbeef; @@ -585,9 +596,16 @@ static HDDEDATA CALLBACK server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon ok(size == 13, "Expected 13, got %d\n", size); size = DdeQueryStringA(server_pid, hsz2, str, MAX_PATH, CP_WINANSI); - ok(!strncmp(str, "TestDDEServer(", 14), "Expected TestDDEServer(, got %s\n", str); - ok(str[size - 1] == ')', "Expected ')', got %c\n", str[size - 1]); - ok(size == 17 + 2*sizeof(ULONG_PTR), "Got size %d for %s\n", size, str); + if (!strncmp( str, "TestDDEServer:(", 15 )) /* win9x style */ + { + ok(size == 16 + 2*sizeof(WORD), "Got size %d for %s\n", size, str); + } + else + { + ok(!strncmp(str, "TestDDEServer(", 14), "Expected TestDDEServer(, got %s\n", str); + ok(size == 17 + 2*sizeof(ULONG_PTR), "Got size %d for %s\n", size, str); + } + ok(str[size - 1] == ')', "Expected ')', got %c\n", str[size - 1]); return (HDDEDATA)TRUE; }

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
67
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 June 2010