June 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : user32: Add a heuristic for Unicode mappings of DDE data on the server side.
by Alexandre Julliard June 25, 2010

June 25, 2010

Module: wine Branch: master Commit: b2de316fc59875a810cbe60e94e05e6c96836e95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2de316fc59875a810cbe60e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 24 23:43:08 2010 +0200 user32: Add a heuristic for Unicode mappings of DDE data on the server side. --- dlls/user32/dde_server.c | 59 ++++++++++++++++++++++++++++++++++++++++++++- dlls/user32/tests/dde.c | 6 +--- 2 files changed, 59 insertions(+), 6 deletions(-) diff --git a/dlls/user32/dde_server.c b/dlls/user32/dde_server.c index 2dc8ae8..0d62c49 100644 --- a/dlls/user32/dde_server.c +++ b/dlls/user32/dde_server.c @@ -29,9 +29,11 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winnls.h" #include "dde.h" #include "ddeml.h" #include "win.h" +#include "wine/unicode.h" #include "wine/debug.h" #include "dde_private.h" @@ -756,6 +758,54 @@ static WDML_XACT* WDML_ServerQueueExecute(WDML_CONV* pConv, LPARAM lParam) return pXAct; } +static BOOL data_looks_unicode( const WCHAR *data, DWORD size ) +{ + DWORD i; + + if (size % sizeof(WCHAR)) return FALSE; + for (i = 0; i < size / sizeof(WCHAR); i++) if (data[i] > 255) return FALSE; + return TRUE; +} + +/* convert data to Unicode, unless it looks like it's already Unicode */ +static HDDEDATA map_A_to_W( DWORD instance, void *ptr, DWORD size ) +{ + HDDEDATA ret; + DWORD len; + const char *end; + + if (!data_looks_unicode( ptr, size )) + { + if ((end = memchr( ptr, 0, size ))) size = end + 1 - (const char *)ptr; + len = MultiByteToWideChar( CP_ACP, 0, ptr, size, NULL, 0 ); + ret = DdeCreateDataHandle( instance, NULL, len * sizeof(WCHAR), 0, 0, CF_TEXT, 0); + MultiByteToWideChar( CP_ACP, 0, ptr, size, (WCHAR *)DdeAccessData(ret, NULL), len ); + } + else ret = DdeCreateDataHandle( instance, ptr, size, 0, 0, CF_TEXT, 0 ); + + return ret; +} + +/* convert data to ASCII, unless it looks like it's not in Unicode format */ +static HDDEDATA map_W_to_A( DWORD instance, void *ptr, DWORD size ) +{ + HDDEDATA ret; + DWORD len; + const WCHAR *end; + + if (data_looks_unicode( ptr, size )) + { + size /= sizeof(WCHAR); + if ((end = memchrW( ptr, 0, size ))) size = end + 1 - (const WCHAR *)ptr; + len = WideCharToMultiByte( CP_ACP, 0, ptr, size, NULL, 0, NULL, NULL ); + ret = DdeCreateDataHandle( instance, NULL, len, 0, 0, CF_TEXT, 0); + WideCharToMultiByte( CP_ACP, 0, ptr, size, (char *)DdeAccessData(ret, NULL), len, NULL, NULL ); + } + else ret = DdeCreateDataHandle( instance, ptr, size, 0, 0, CF_TEXT, 0 ); + + return ret; +} + /****************************************************************** * WDML_ServerHandleExecute * @@ -769,11 +819,16 @@ static WDML_QUEUE_STATE WDML_ServerHandleExecute(WDML_CONV* pConv, WDML_XACT* pX if (!(pConv->instance->CBFflags & CBF_FAIL_EXECUTES)) { LPVOID ptr = GlobalLock(pXAct->hMem); + DWORD size = GlobalSize(pXAct->hMem); if (ptr) { - hDdeData = DdeCreateDataHandle(pConv->instance->instanceID, ptr, GlobalSize(pXAct->hMem), - 0, 0, CF_TEXT, 0); + if (pConv->instance->unicode) /* Unicode server, try to map A->W */ + hDdeData = map_A_to_W( pConv->instance->instanceID, ptr, size ); + else if (!IsWindowUnicode( pConv->hwndClient )) /* ASCII server and client, try to map W->A */ + hDdeData = map_W_to_A( pConv->instance->instanceID, ptr, size ); + else + hDdeData = DdeCreateDataHandle(pConv->instance->instanceID, ptr, size, 0, 0, CF_TEXT, 0); GlobalUnlock(pXAct->hMem); } hDdeData = WDML_InvokeCallback(pConv->instance, XTYP_EXECUTE, 0, (HCONV)pConv, diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index ce6d964..529c527 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2486,11 +2486,9 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV case 0: /* ASCII string */ if (unicode_server) { - todo_wine { ok(size == size_a_to_w, "Wrong size %d/%d, msg_index=%d\n", size, size_a_to_w, msg_index); ok(!lstrcmpW((WCHAR*)buffer, test_cmd_a_to_w), "Expected %s, msg_index=%d\n", wine_dbgstr_w(test_cmd_a_to_w), msg_index); - } } else if (unicode_client) { @@ -2519,7 +2517,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV ok(!lstrcmpA((CHAR*)buffer, test_cmd_w_to_a), "Expected %s, got %s, msg_index=%d\n", test_cmd_w_to_a, buffer, msg_index); } - else todo_wine + else { ok(size == size_w_to_a, "Wrong size %d/%d, msg_index=%d\n", size, size_w_to_a, msg_index); @@ -2531,7 +2529,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV case 2: /* normal Unicode string */ case 3: /* IsTextUnicode false negative */ case 4: /* Chinese chars */ - if (unicode_server) todo_wine + if (unicode_server) { /* double A->W mapping */ /* NT uses the full size, XP+ only until the first null */

1 0

André Hentschel : kernel32: Update a warning.
by Alexandre Julliard June 25, 2010

June 25, 2010

Module: wine Branch: master Commit: c85357a230cf80c4af651c4539086f3901c8a53f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c85357a230cf80c4af651c453… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 24 20:15:06 2010 +0200 kernel32: Update a warning. --- dlls/kernel32/computername.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c index 258f297..f710d7c 100644 --- a/dlls/kernel32/computername.c +++ b/dlls/kernel32/computername.c @@ -551,7 +551,7 @@ BOOL WINAPI SetComputerNameW( LPCWSTR lpComputerName ) { /* This check isn't necessary, but may help debugging problems. */ WARN( "Disabled by Wine Configuration.\n" ); - WARN( "Set \"UseDnsComputerName\" = \"N\" in category [Network] to enable.\n" ); + WARN( "Set \"UseDnsComputerName\" = \"N\" in HKCU\\Software\\Wine\\Network to enable.\n" ); SetLastError ( ERROR_ACCESS_DENIED ); return FALSE; }

1 0

André Hentschel : wineps.drv: Update comments.
by Alexandre Julliard June 25, 2010

June 25, 2010

Module: wine Branch: master Commit: 5038c2c286e365723d2067b8866831217777576c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5038c2c286e365723d2067b88… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 24 20:15:09 2010 +0200 wineps.drv: Update comments. --- dlls/wineps.drv/afm.c | 7 ++++--- dlls/wineps.drv/truetype.c | 2 +- dlls/wineps.drv/type1afm.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wineps.drv/afm.c b/dlls/wineps.drv/afm.c index 5c9278a..6f7d8f8 100644 --- a/dlls/wineps.drv/afm.c +++ b/dlls/wineps.drv/afm.c @@ -273,9 +273,10 @@ static BOOL AddBuiltinAFMs(void) * * PSDRV_GetFontMetrics * - * Parses all afm files listed in [afmdirs] and [TrueType Font Directories] - * sections of Wine configuration file. Adds built-in data last, so it can - * be overridden by user-supplied AFM or TTF files. + * Parses all afm files listed in the + * HKEY_CURRENT_USER\\Software\\Wine\\Fonts registry key. + * Adds built-in data last, so it can be overridden by + * user-supplied AFM or TTF files. * * If this function fails, PSDRV_Init will destroy PSDRV_Heap, so don't worry * about freeing all the memory that's been allocated. diff --git a/dlls/wineps.drv/truetype.c b/dlls/wineps.drv/truetype.c index 36ee404..e53b4ad 100644 --- a/dlls/wineps.drv/truetype.c +++ b/dlls/wineps.drv/truetype.c @@ -570,7 +570,7 @@ static BOOL ReadTrueTypeDir(FT_Library library, LPCSTR dirname) * PSDRV_GetTrueTypeMetrics * * Reads font metrics from TrueType font files in directories listed in the - * [TrueType Font Directories] section of the Wine configuration file. + * HKEY_CURRENT_USER\\Software\\Wine\\Fonts\\Path registry string. * * If this function fails (returns FALSE), the driver will fail to initialize * and the driver heap will be destroyed, so it's not necessary to HeapFree diff --git a/dlls/wineps.drv/type1afm.c b/dlls/wineps.drv/type1afm.c index e7248c4..f9a8bcb 100644 --- a/dlls/wineps.drv/type1afm.c +++ b/dlls/wineps.drv/type1afm.c @@ -1167,7 +1167,7 @@ static BOOL ReadAFMDir(LPCSTR dirname) * PSDRV_GetType1Metrics * * Reads font metrics from Type 1 AFM font files in directories listed in the - * [afmdirs] section of the Wine configuration file. + * HKEY_CURRENT_USER\\Software\\Wine\\Fonts\\AFMPath registry string. * * If this function fails (returns FALSE), the driver will fail to initialize * and the driver heap will be destroyed, so it's not necessary to HeapFree

1 0

Gustavo Henrique Milaré : jscript: Update Portuguese (Brazilian) translation.
by Alexandre Julliard June 25, 2010

June 25, 2010

Module: wine Branch: master Commit: ca94a9cb0563a6ec0db43c39e15ec8e73474dfc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca94a9cb0563a6ec0db43c39e… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Jun 24 17:21:54 2010 -0300 jscript: Update Portuguese (Brazilian) translation. --- dlls/jscript/jscript_Pt.rc | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Pt.rc b/dlls/jscript/jscript_Pt.rc index 0ac712b..a907b10 100644 --- a/dlls/jscript/jscript_Pt.rc +++ b/dlls/jscript/jscript_Pt.rc @@ -1,5 +1,6 @@ /* * Copyright 2009 Ricardo Filipe + * Copyright 2010 Gustavo Henrique Milaré * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,6 +21,34 @@ #pragma code_page(65001) +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE DISCARDABLE +{ + IDS_TO_PRIMITIVE "Erro ao converter objeto em tipo primitivo" + IDS_INVALID_CALL_ARG "Argumento ou chamada de procedimento inválida" + IDS_CREATE_OBJ_ERROR "O servidor de automação não conseguiu criar o objeto" + IDS_NO_PROPERTY "O objeto não suporta esta propriedade ou método" + IDS_ARG_NOT_OPT "Argumento não opcional" + IDS_SYNTAX_ERROR "Erro de sintaxe" + IDS_SEMICOLON "';' esperado" + IDS_LBRACKET "'(' esperado" + IDS_RBRACKET "')' esperado" + IDS_UNTERMINATED_STR "Constante de string não terminada" + IDS_NOT_FUNC "Função esperada" + IDS_NOT_DATE "'[object]' não é um objeto de data" + IDS_NOT_NUM "Número esperado" + IDS_OBJECT_EXPECTED "Objeto esperado" + IDS_ILLEGAL_ASSIGN "Atribuição ilegal" + IDS_UNDEFINED "'|' é indefinido" + IDS_NOT_BOOL "Objeto boleano esperado" + IDS_JSCRIPT_EXPECTED "Objeto JScript esperado" + IDS_REGEXP_SYNTAX_ERROR "Erro de sintaxe na expressão regular" + IDS_URI_INVALID_CHAR "URI a ser codificado contém caracteres inválidos" + IDS_INVALID_LENGTH "Tamanho do vetor tem que ser um inteiro finito positivo" + IDS_ARRAY_EXPECTED "Objeto Array esperado" +} + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE DISCARDABLE

1 0

Gustavo Henrique Milaré : gphoto2.gs: Update Portuguese (Brazilian) translation.
by Alexandre Julliard June 25, 2010

June 25, 2010

Module: wine Branch: master Commit: ef21a144e7bcf97aece457510584394a6dc5b751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef21a144e7bcf97aece457510… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Jun 24 18:18:24 2010 -0300 gphoto2.gs: Update Portuguese (Brazilian) translation. --- dlls/gphoto2.ds/gphoto2_Pt.rc | 46 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Pt.rc b/dlls/gphoto2.ds/gphoto2_Pt.rc index 284f557..fef94e0 100644 --- a/dlls/gphoto2.ds/gphoto2_Pt.rc +++ b/dlls/gphoto2.ds/gphoto2_Pt.rc @@ -2,6 +2,7 @@ * Portuguese resources for Twain * * Copyright 2008 Ricardo Filipe + * Copyright 2010 Gustavo Henrique Milaré * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +23,23 @@ #pragma code_page(65001) +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 +STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +CAPTION "Arquivos na Câmera" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | +WS_TABSTOP,7,7,358,229 + DEFPUSHBUTTON "Importar Selecionado",IDC_IMPORT,152,252,72,14 + PUSHBUTTON "Pré-visualizar",IDC_FETCH,7,252,64,14 + PUSHBUTTON "Importar tudo",IDC_IMPORTALL,80,252,64,14 + CONTROL "Passar à frente",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + PUSHBUTTON "Sair",IDC_EXIT,315,252,50,14 +END + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 @@ -39,6 +57,19 @@ WS_TABSTOP,7,7,358,229 PUSHBUTTON "Sair",IDC_EXIT,315,252,50,14 END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Transferindo" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Transferindo... Por favor espere",IDC_STATIC,5,19,176,8, SS_CENTER +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND CAPTION "A transferir" @@ -47,6 +78,21 @@ BEGIN LTEXT "A transferir... Por favor espere",IDC_STATIC,5,19,176,8, SS_CENTER END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER +CAPTION "Contectando à câmera" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "Contectando à câmera... Por favor espere",IDC_STATIC,128,58, + 116,8 +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER CAPTION "A ligar à câmara"

1 0

Gustavo Henrique Milaré : notepad: Update Portuguese (Brazilian) translation.
by Alexandre Julliard June 25, 2010

June 25, 2010

Module: wine Branch: master Commit: 6f163d0c2bb88ad421372ff383ff6686f1322f77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f163d0c2bb88ad421372ff38… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Wed Jun 23 20:57:14 2010 -0300 notepad: Update Portuguese (Brazilian) translation. --- programs/notepad/Pt.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Pt.rc b/programs/notepad/Pt.rc index 959ff51..7569627 100644 --- a/programs/notepad/Pt.rc +++ b/programs/notepad/Pt.rc @@ -181,6 +181,16 @@ Gostaria de salvar as alterações?" STRING_NOTFOUND, "'%s' não pode ser encontrado." STRING_OUT_OF_MEMORY, "Não há memória suficiente para completar essa \ tarefa.\nFeche um ou mais aplicativos para aumentar a quantidade de memória livre." + +STRING_UNICODE_LE, "Unicode (UTF-16)" +STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +Este arquivo contém caracteres Unicode que serão perdidos se\n\ +for salvo na codificação %s.\n\ +Para manter estes caracteres, clique em Cancelar e depois selecione\n\ +uma das opções Unicode na lista de Codificações.\n\ +Continuar?" } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE

1 0

Alexandre Julliard : Revert "winebrowser: Convert URL obtained through DdeGetData to Unicode."
by Alexandre Julliard June 25, 2010

June 25, 2010

Module: wine Branch: master Commit: 6f2aa56ce640a3d9256f076271fbedbfddb972fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f2aa56ce640a3d9256f07627… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 24 23:42:41 2010 +0200 Revert "winebrowser: Convert URL obtained through DdeGetData to Unicode." This reverts commit 3dcf22e03fb4473db112bcd47671b37a037cbfc6. The conversion is now properly handled in DDEML. --- programs/winebrowser/main.c | 18 +++--------------- 1 files changed, 3 insertions(+), 15 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index b959d38..f5ffe05 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -199,27 +199,15 @@ static HDDEDATA CALLBACK ddeCb(UINT uType, UINT uFmt, HCONV hConv, return (HDDEDATA)FALSE; case XTYP_EXECUTE: - { - char *buffer = NULL; - if (!(size = DdeGetData(hData, NULL, 0, 0))) WINE_ERR("DdeGetData returned zero size of execute string\n"); - else if (!(buffer = HeapAlloc(GetProcessHeap(), 0, size))) + else if (!(ddeString = HeapAlloc(GetProcessHeap(), 0, size))) WINE_ERR("Out of memory\n"); - else if (DdeGetData(hData, (LPBYTE)buffer, size, 0) != size) + else if (DdeGetData(hData, (LPBYTE)ddeString, size, 0) != size) WINE_WARN("DdeGetData did not return %d bytes\n", size); - else - { - int len = MultiByteToWideChar(CP_ACP, 0, buffer, -1, NULL, 0); - if (!(ddeString = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) - WINE_ERR("Out of memory\n"); - else - MultiByteToWideChar(CP_ACP, 0, buffer, -1, ddeString, len); - } - HeapFree(GetProcessHeap(), 0, buffer); DdeFreeDataHandle(hData); return (HDDEDATA)DDE_FACK; - } + case XTYP_REQUEST: ret = -3; /* error */ if (!(size = DdeQueryStringW(ddeInst, hsz2, NULL, 0, CP_WINUNICODE)))

1 0

Alexandre Julliard : user32/tests: Fix more DDE test failures on Win9x.
by Alexandre Julliard June 25, 2010

June 25, 2010

Module: wine Branch: master Commit: f83bc2e50aee53dd04cfb72e0c384dd560e26f54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f83bc2e50aee53dd04cfb72e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 24 23:36:24 2010 +0200 user32/tests: Fix more DDE test failures on Win9x. --- dlls/user32/tests/dde.c | 40 ++++++++++++++++++++++++++++------------ 1 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 5ee5b47..ce6d964 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -405,7 +405,8 @@ 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 || broken(res == 0xdeadbeef), /* win9x */ "Expected DDE_FACK, got %x\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); /* XTYP_POKE, correct params */ @@ -432,16 +433,25 @@ 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 || broken(res == 0xdeadbeef), /* win9x */ "Expected DDE_FACK, got %x\n", res); + ok(res == DDE_FACK || broken(res == (0xdead0000 | DDE_FACK)), /* win9x */ + "Expected DDE_FACK, got %x\n", res); /* XTYP_EXECUTE, no data */ res = 0xdeadbeef; DdeGetLastError(client_pid); op = DdeClientTransaction(NULL, 0, conversation, NULL, 0, XTYP_EXECUTE, default_timeout, &res); ret = DdeGetLastError(client_pid); - ok(op == NULL, "Expected NULL, got %p\n", op); - ok(res == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", res); - ok(ret == DMLERR_MEMORY_ERROR, "Expected DMLERR_MEMORY_ERROR, got %d\n", ret); + ok(op == NULL || broken(op == (HDDEDATA)TRUE), /* win9x */ "Expected NULL, got %p\n", op); + if (!op) + { + ok(res == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", res); + ok(ret == DMLERR_MEMORY_ERROR, "Expected DMLERR_MEMORY_ERROR, got %d\n", ret); + } + else /* win9x */ + { + ok(res == (0xdead0000 | DDE_FACK), "Expected DDE_FACK, got %x\n", res); + ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); + } /* XTYP_EXECUTE, no data, -1 size */ res = 0xdeadbeef; @@ -450,7 +460,8 @@ todo_wine ret = DdeGetLastError(client_pid); ok(op == NULL, "Expected NULL, got %p\n", op); ok(res == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", res); - ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret); + ok(ret == DMLERR_INVALIDPARAMETER || broken(ret == DMLERR_NO_ERROR), /* win9x */ + "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret); DdeFreeStringHandle(client_pid, topic); DdeFreeDataHandle(hdata); @@ -463,14 +474,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 == (0xdead0000 | DDE_FNOTPROCESSED)), /* win9x */ + "Expected DDE_FNOTPROCESSED, got %d\n", res); if (hdata == NULL) ok(FALSE, "hdata is NULL\n"); else { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "command executed\r\n"), "Expected 'command executed\\r\\n', got %s\n", str); - ok(size == 21, "Expected 21, got %d\n", size); + ok(size == 21 || broken(size == 28), /* sizes are rounded up on win9x */ + "Expected 21, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -710,7 +723,8 @@ static HDDEDATA CALLBACK server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon ptr = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(ptr, "poke data\r\n"), "Expected 'poke data\\r\\n', got %s\n", ptr); - ok(size == 12, "Expected 12, got %d\n", size); + ok(size == 12 || broken(size == 28), /* sizes are rounded up on win9x */ + "Expected 12, got %d\n", size); DdeUnaccessData(hdata); size = DdeQueryStringA(server_pid, hsz2, str, MAX_PATH, CP_WINANSI); @@ -904,7 +918,7 @@ static LRESULT WINAPI dde_msg_client_wndproc(HWND hwnd, UINT msg, WPARAM wparam, ok(ack->reserved == 0, "Expected 0, got %d\n", ack->reserved); ok(ack->fBusy == FALSE, "Expected FALSE, got %d\n", ack->fBusy); - ok(hi == (UINT_PTR)execute_hglobal, "Execpted execute hglobal, got %08lx\n", hi); + ok(hi == (UINT_PTR)execute_hglobal, "Expected execute hglobal, got %08lx\n", hi); ptr = GlobalLock((HGLOBAL)hi); if (msg_index == 9) @@ -1596,7 +1610,8 @@ todo_wine { ret = 0xdeadbeef; hdata = DdeClientTransaction((LPBYTE)test_cmd, strlen(test_cmd) + 1, hconv, (HSZ)0xdead, 0xbeef, XTYP_EXECUTE, 1000, &ret); ok(!hdata, "DdeClientTransaction succeeded\n"); - ok(ret == DDE_FNOTPROCESSED, "wrong status code %04x\n", ret); + ok(ret == DDE_FNOTPROCESSED || broken(ret == (0xdead0000 | DDE_FNOTPROCESSED)), /* win9x */ + "wrong status code %04x\n", ret); err = DdeGetLastError(dde_inst); ok(err == DMLERR_NOTPROCESSED, "wrong dde error %x\n", err); @@ -1643,7 +1658,8 @@ todo_wine { else /* no mapping */ { ok(!hdata, "DdeClientTransaction returned %p, error %x\n", hdata, err); - ok(ret == DDE_FNOTPROCESSED, "wrong status code %04x\n", ret); + ok(ret == DDE_FNOTPROCESSED || broken(ret == (0xdead0000 | DDE_FNOTPROCESSED)), /* win9x */ + "wrong status code %04x\n", ret); ok(err == DMLERR_NOTPROCESSED, "DdeClientTransaction returned error %x\n", err); }

1 0

Alexandre Julliard : user32/tests: Restructure the DDE end-to-end tests to make it easier to add new cases.
by Alexandre Julliard June 25, 2010

June 25, 2010

Module: wine Branch: master Commit: c58fe1f414cf4bbcb15d40695d41e74575b2c34f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c58fe1f414cf4bbcb15d40695… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 24 19:56:49 2010 +0200 user32/tests: Restructure the DDE end-to-end tests to make it easier to add new cases. --- dlls/user32/tests/dde.c | 169 ++++++++++++++++++++++++----------------------- 1 files changed, 86 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c58fe1f414cf4bbcb15d4…

1 0

Alexandre Julliard : user32/tests: Add some Unicode test cases for A/ W mappings.
by Alexandre Julliard June 25, 2010

June 25, 2010

Module: wine Branch: master Commit: 83adf08bb7915ab9f1e32fec0ec214babb270ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=83adf08bb7915ab9f1e32fec0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 24 21:27:45 2010 +0200 user32/tests: Add some Unicode test cases for A/W mappings. --- dlls/user32/tests/dde.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index eb30c15..5ee5b47 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2373,6 +2373,9 @@ static void test_UnpackDDElParam(void) static char test_cmd_a_to_a[] = "Test dde command"; static WCHAR test_cmd_w_to_w[][32] = { {'t','e','s','t',' ','d','d','e',' ','c','o','m','m','a','n','d',0}, + { 0x2018, 0x2019, 0x0161, 0x0041, 0x02dc, 0 }, /* some chars that should map properly to CP1252 */ + { 0x2026, 0x2020, 0x2021, 0x0d0a, 0 }, /* false negative for IsTextUnicode */ + { 0x4efa, 0x4efc, 0x0061, 0x4efe, 0 }, /* some Chinese chars */ }; static const int nb_callbacks = 5 + sizeof(test_cmd_w_to_w)/sizeof(test_cmd_w_to_w[0]); @@ -2509,6 +2512,35 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV } break; + case 2: /* normal Unicode string */ + case 3: /* IsTextUnicode false negative */ + case 4: /* Chinese chars */ + if (unicode_server) todo_wine + { + /* double A->W mapping */ + /* NT uses the full size, XP+ only until the first null */ + DWORD nt_size = MultiByteToWideChar( CP_ACP, 0, (char *)cmd_w, size_w, test_cmd_a_to_w, + sizeof(test_cmd_a_to_w)/sizeof(WCHAR) ) * sizeof(WCHAR); + DWORD xp_size = MultiByteToWideChar( CP_ACP, 0, (char *)cmd_w, -1, NULL, 0 ) * sizeof(WCHAR); + ok(size == xp_size || broken(size == nt_size), + "Wrong size %d/%d, msg_index=%d\n", size, size_a_to_w, msg_index); + ok(!lstrcmpW((WCHAR*)buffer, test_cmd_a_to_w), + "Expected %s, msg_index=%d\n", wine_dbgstr_w(test_cmd_a_to_w), msg_index); + } + else if (unicode_client) + { + ok(size == size_w_to_a, "Wrong size %d/%d, msg_index=%d\n", size, size_w_to_a, msg_index); + ok(!lstrcmpA((CHAR*)buffer, test_cmd_w_to_a), "Expected %s, got %s, msg_index=%d\n", + test_cmd_w_to_a, buffer, msg_index); + } + else + { + ok(size == size_w, "Wrong size %d/%d, msg_index=%d\n", size, size_w, msg_index); + ok(!lstrcmpW((WCHAR*)buffer, cmd_w), + "Expected %s, msg_index=%d\n", wine_dbgstr_w(cmd_w), msg_index); + } + break; + default: ok( 0, "Invalid message %u\n", msg_index ); break;

1 0