← Back to branch summary

~ubuntu-branches/ubuntu/maverick/wine/maverick

« back to all changes in this revision

Viewing changes to programs/winebrowser/main.c

  • Committer: Bazaar Package Importer
  • Author(s): Scott Ritchie
  • Date: 2008-06-17 10:22:39 UTC
  • mfrom: (1.1.41 upstream)
  • Revision ID: james.westby@ubuntu.com-20080617102239-s8olx8ehtsdejmhz
Tags: 1.0.0-1ubuntu1
* New upstream release
  - First stable release of Wine
* Change to 1.0.0 versioning scheme since Wine will make a 1.0.1
* Remove dh_installchangelogs since the upstream changelog was removed
  - It is now available online at winehq.org

Show diffs side-by-side

added added

removed removed

Lines of Context:
programs/winebrowser/main.c
190
190
            return (HDDEDATA)FALSE;
191
191
 
192
192
        case XTYP_EXECUTE:
 
193
        {
 
194
            char *buffer = NULL;
 
195
 
193
196
            if (!(size = DdeGetData(hData, NULL, 0, 0)))
194
197
                WINE_ERR("DdeGetData returned zero size of execute string\n");
195
 
            else if (!(ddeString = HeapAlloc(GetProcessHeap(), 0, size)))
 
198
            else if (!(buffer = HeapAlloc(GetProcessHeap(), 0, size)))
196
199
                WINE_ERR("Out of memory\n");
197
 
            else if (DdeGetData(hData, (LPBYTE)ddeString, size, 0) != size)
 
200
            else if (DdeGetData(hData, (LPBYTE)buffer, size, 0) != size)
198
201
                WINE_WARN("DdeGetData did not return %d bytes\n", size);
 
202
            else
 
203
            {
 
204
                int len = MultiByteToWideChar(CP_ACP, 0, buffer, -1, NULL, 0);
 
205
                if (!(ddeString = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR))))
 
206
                    WINE_ERR("Out of memory\n");
 
207
                else
 
208
                    MultiByteToWideChar(CP_ACP, 0, buffer, -1, ddeString, len);
 
209
            }
 
210
            HeapFree(GetProcessHeap(), 0, buffer);
199
211
            DdeFreeDataHandle(hData);
200
212
            return (HDDEDATA)DDE_FACK;
201
 
 
 
213
        }
202
214
        case XTYP_REQUEST:
203
215
            ret = -3; /* error */
204
216
            if (!(size = DdeQueryStringW(ddeInst, hsz2, NULL, 0, CP_WINUNICODE)))