marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "winebrowser: Convert URL obtained through DdeGetData to Unicode." 

This reverts commit 3dcf22e03f. The
conversion is now properly handled in DDEML.
oldstable
Alexandre Julliard 2010-06-24 23:42:41 +02:00
parent b2de316fc5
commit 6f2aa56ce6
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
programs/winebrowser/main.c
View File

@ -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)))