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

Vincent Povirk : gdiplus: Stub GdipGetPathGradientCenterColor.
by Alexandre Julliard 25 Jun '10

25 Jun '10

Module: wine Branch: master Commit: 0178093576da0763cf4b5956d8045a4ed552137e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0178093576da0763cf4b5956d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jun 19 16:15:00 2010 -0500 gdiplus: Stub GdipGetPathGradientCenterColor. --- dlls/gdiplus/brush.c | 13 +++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index a6da058..421d053 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1064,6 +1064,19 @@ GpStatus WINGDIPAPI GdipGetPathGradientCenterPointI(GpPathGradient *grad, return ret; } +GpStatus WINGDIPAPI GdipGetPathGradientCenterColor(GpPathGradient *grad, + ARGB *colors) +{ + static int calls; + + TRACE("(%p,%p)\n", grad, colors); + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetPathGradientFocusScales(GpPathGradient *grad, REAL *x, REAL *y) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 68b8884..e48a70a 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -327,7 +327,7 @@ @ stdcall GdipGetPathFillMode(ptr ptr) @ stdcall GdipGetPathGradientBlend(ptr ptr ptr long) @ stdcall GdipGetPathGradientBlendCount(ptr ptr) -@ stub GdipGetPathGradientCenterColor +@ stdcall GdipGetPathGradientCenterColor(ptr ptr) @ stdcall GdipGetPathGradientCenterPoint(ptr ptr) @ stdcall GdipGetPathGradientCenterPointI(ptr ptr) @ stdcall GdipGetPathGradientFocusScales(ptr ptr ptr)

1 0

Vincent Povirk : gdiplus: Always create path gradient brushes with blend positions.
by Alexandre Julliard 25 Jun '10

25 Jun '10

Module: wine Branch: master Commit: 4c93f9f8805251c88cb8536ed371f57cc35ecbbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c93f9f8805251c88cb8536ed… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jun 19 16:31:14 2010 -0500 gdiplus: Always create path gradient brushes with blend positions. --- dlls/gdiplus/brush.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 421d053..b399fce 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -574,12 +574,15 @@ GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF* points, if (!*grad) return OutOfMemory; (*grad)->blendfac = GdipAlloc(sizeof(REAL)); - if(!(*grad)->blendfac){ + (*grad)->blendpos = GdipAlloc(sizeof(REAL)); + if(!(*grad)->blendfac || !(*grad)->blendpos){ + GdipFree((*grad)->blendfac); + GdipFree((*grad)->blendpos); GdipFree(*grad); return OutOfMemory; } (*grad)->blendfac[0] = 1.0; - (*grad)->blendpos = NULL; + (*grad)->blendpos[0] = 1.0; (*grad)->blendcount = 1; (*grad)->pathdata.Count = count; @@ -664,12 +667,15 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, if (!*grad) return OutOfMemory; (*grad)->blendfac = GdipAlloc(sizeof(REAL)); - if(!(*grad)->blendfac){ + (*grad)->blendpos = GdipAlloc(sizeof(REAL)); + if(!(*grad)->blendfac || !(*grad)->blendpos){ + GdipFree((*grad)->blendfac); + GdipFree((*grad)->blendpos); GdipFree(*grad); return OutOfMemory; } (*grad)->blendfac[0] = 1.0; - (*grad)->blendpos = NULL; + (*grad)->blendpos[0] = 1.0; (*grad)->blendcount = 1; (*grad)->pathdata.Count = path->pathdata.Count;

1 0

Gustavo Henrique Milaré : mapi32: Update Portuguese (Brazilian) translation.
by Alexandre Julliard 25 Jun '10

25 Jun '10

Module: wine Branch: master Commit: 007dc192957f928b38f2785073e76482e6a94344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=007dc192957f928b38f278507… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Jun 24 17:29:51 2010 -0300 mapi32: Update Portuguese (Brazilian) translation. --- dlls/mapi32/Pt.rc | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mapi32/Pt.rc b/dlls/mapi32/Pt.rc index ab8a8d1..b12e6c5 100644 --- a/dlls/mapi32/Pt.rc +++ b/dlls/mapi32/Pt.rc @@ -2,6 +2,7 @@ * MAPI32 Portuguese resources * * Copyright 2010 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 @@ -21,10 +22,18 @@ #include "res.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE - #pragma code_page(65001) +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "O envio do e-mail falhou porque não existe um cliente de e-mail MAPI instalado." + IDS_SEND_MAIL, "Enviar E-mail" +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + STRINGTABLE { IDS_NO_MAPI_CLIENT, "O envio de correio falhou porque não existe um cliente de correio MAPI instalado."

1 0

Gustavo Henrique Milaré : msacm32: Update Portuguese (Brazilian) translation.
by Alexandre Julliard 25 Jun '10

25 Jun '10

Module: wine Branch: master Commit: 16752ff94c7b512b7115f77e05f89651f0a9453a URL: http://source.winehq.org/git/wine.git/?a=commit;h=16752ff94c7b512b7115f77e0… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Jun 24 17:33:12 2010 -0300 msacm32: Update Portuguese (Brazilian) translation. --- dlls/msacm32/msacm_Pt.rc | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msacm32/msacm_Pt.rc b/dlls/msacm32/msacm_Pt.rc index 9309b4c..440dc3e 100644 --- a/dlls/msacm32/msacm_Pt.rc +++ b/dlls/msacm32/msacm_Pt.rc @@ -2,7 +2,8 @@ * Portuguese resource file for MS ACM * * Copyright 2003 Marcelo Duarte - * Copyright 2006 Am�rico Jos� Melo + * Copyright 2006 Américo José Melo + * 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 @@ -21,11 +22,13 @@ #include "wineacm.h" +#pragma code_page(65001) + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Selec��o de som" +CAPTION "Seleção de som" FONT 8, "MS Shell Dlg" BEGIN @@ -34,7 +37,7 @@ BEGIN COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Gravar como...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&Salvar como...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 PUSHBUTTON "&Remover", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 LTEXT "&Formato:", -1, 5, 41, 44, 8, NOT WS_GROUP @@ -57,7 +60,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Selec��o de som" +CAPTION "Selecção de som" FONT 8, "MS Shell Dlg" BEGIN

1 0

Gustavo Henrique Milaré : mshtml: Updated Portuguese (Brazilian) translation.
by Alexandre Julliard 25 Jun '10

25 Jun '10

Module: wine Branch: master Commit: 06175d046fcd396d6e5122beb6212e8a39b48625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06175d046fcd396d6e5122beb… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Jun 24 17:52:32 2010 -0300 mshtml: Updated Portuguese (Brazilian) translation. --- dlls/mshtml/Pt.rc | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Pt.rc b/dlls/mshtml/Pt.rc index 0620702..689f930 100644 --- a/dlls/mshtml/Pt.rc +++ b/dlls/mshtml/Pt.rc @@ -1,5 +1,6 @@ /* * 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 @@ -20,6 +21,16 @@ #pragma code_page(65001) +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE DISCARDABLE +{ + IDS_HTMLDISABLED "A interpretação de HTML está desativada." + IDS_HTMLDOCUMENT "Documento HTML" + IDS_DOWNLOADING "Fazendo o download..." + IDS_INSTALLING "Instalando..." +} + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE DISCARDABLE @@ -30,6 +41,26 @@ STRINGTABLE DISCARDABLE IDS_INSTALLING "A instalar..." } + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalador Wine Gecko" +FONT 8, "MS Shell Dlg" +{ + LTEXT "O Wine não pôde encontrar o pacote Gecko que é necessário para aplicações com HTML embutido" \ + "funcionarem corretamente. O Wine pode automaticamente efetuar o download instalá-lo para você.\n\n" \ + "Nota: é recomendável usar os pacotes da sua distribuição ao invés disso. \n\ +Veja http://wiki.winehq.org/Gecko para mais detalhes.", + ID_DWL_STATUS, 10, 10, 240, 60, SS_LEFT + CONTROL "Progresso", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 + DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancelar", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalador Wine Gecko" @@ -44,6 +75,25 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Cancelar", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP } + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Hiperlink" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Informação do Hiperlink", -1, 5, 5, 190, 55 + LTEXT "&Tipo:", -1, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "&URL:", -1, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hiperligação" @@ -58,6 +108,9 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Cancelar", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION ""

1 0

Dylan Smith : wordpad: Use correct resource ID for tab stops dialog.
by Alexandre Julliard 25 Jun '10

25 Jun '10

Module: wine Branch: master Commit: 0c50285e3e49151bb13422e6c80574c53dfaaa69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c50285e3e49151bb13422e6c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jun 24 18:36:04 2010 -0400 wordpad: Use correct resource ID for tab stops dialog. Fixes regression from commit 55f024afe195659e257e4806e4737a7a0fa63c22. --- programs/wordpad/wordpad.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index d73a79b..0e6566d 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2435,7 +2435,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) break; case ID_TABSTOPS: - DialogBoxW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_PARAFORMAT), hWnd, tabstops_proc); + DialogBoxW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_TABSTOPS), hWnd, tabstops_proc); break; case ID_ABOUT:

1 0

Alexandre Julliard : user32: Add a heuristic for Unicode mappings of DDE data on the server side.
by Alexandre Julliard 25 Jun '10

25 Jun '10

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

Alexandre Julliard : Revert "winebrowser: Convert URL obtained through DdeGetData to Unicode."
by Alexandre Julliard 25 Jun '10

25 Jun '10

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 : shell32: Fix DDE command tracing now that we are receiving Unicode.
by Alexandre Julliard 25 Jun '10

25 Jun '10

Module: wine Branch: master Commit: cedeccce76a6e94c171c99215e507e6ce0228b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cedeccce76a6e94c171c99215… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 25 00:00:35 2010 +0200 shell32: Fix DDE command tracing now that we are receiving Unicode. --- dlls/shell32/dde.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 817fd33..2cbcb0d 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -88,13 +88,13 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, static inline DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata) { - BYTE * pszCommand; + WCHAR * pszCommand; - pszCommand = DdeAccessData(hdata, NULL); + pszCommand = (WCHAR *)DdeAccessData(hdata, NULL); if (!pszCommand) return DDE_FNOTPROCESSED; - FIXME("stub: %s %s\n", debugstr_hsz(hszTopic), pszCommand); + FIXME("stub: %s %s\n", debugstr_hsz(hszTopic), debugstr_w(pszCommand)); DdeUnaccessData(hdata);

1 0

André Hentschel : kernel32: Update a warning.
by Alexandre Julliard 25 Jun '10

25 Jun '10

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