January 2009 - Wine-commits

Huw Davies : comdlg32: Use unicode APIs to react to the change printer combo.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: 26f11704d41ee28e85baebbe95b044680bdf39d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26f11704d41ee28e85baebbe9… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 21 10:41:36 2009 +0000 comdlg32: Use unicode APIs to react to the change printer combo. --- dlls/comdlg32/printdlg.c | 214 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 148 insertions(+), 66 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index a07a723..2b939f3 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -86,6 +86,47 @@ static const WCHAR printdlg_prop[] = {'_','_','W','I','N','E','_','P','R','I','N static const WCHAR pagesetupdlg_prop[] = { '_', '_', 'W', 'I', 'N', 'E', '_', 'P', 'A', 'G', 'E', 'S', 'E', 'T', 'U', 'P', 'D', 'L', 'G', 'D', 'A', 'T', 'A', 0 }; + +/*********************************************************** + * convert_to_devmodeA + * + * Creates an ansi copy of supplied devmode + */ +static DEVMODEA *convert_to_devmodeA(const DEVMODEW *dmW) +{ + DEVMODEA *dmA; + DWORD size; + + if (!dmW) return NULL; + size = dmW->dmSize - CCHDEVICENAME - + ((dmW->dmSize > FIELD_OFFSET(DEVMODEW, dmFormName)) ? CCHFORMNAME : 0); + + dmA = HeapAlloc(GetProcessHeap(), 0, size + dmW->dmDriverExtra); + if (!dmA) return NULL; + + WideCharToMultiByte(CP_ACP, 0, dmW->dmDeviceName, -1, + (LPSTR)dmA->dmDeviceName, CCHDEVICENAME, NULL, NULL); + + if (FIELD_OFFSET(DEVMODEW, dmFormName) >= dmW->dmSize) + { + memcpy(&dmA->dmSpecVersion, &dmW->dmSpecVersion, + dmW->dmSize - FIELD_OFFSET(DEVMODEW, dmSpecVersion)); + } + else + { + memcpy(&dmA->dmSpecVersion, &dmW->dmSpecVersion, + FIELD_OFFSET(DEVMODEW, dmFormName) - FIELD_OFFSET(DEVMODEW, dmSpecVersion)); + WideCharToMultiByte(CP_ACP, 0, dmW->dmFormName, -1, + (LPSTR)dmA->dmFormName, CCHFORMNAME, NULL, NULL); + + memcpy(&dmA->dmLogPixels, &dmW->dmLogPixels, dmW->dmSize - FIELD_OFFSET(DEVMODEW, dmLogPixels)); + } + + dmA->dmSize = size; + memcpy((char *)dmA + dmA->dmSize, (const char *)dmW + dmW->dmSize, dmW->dmDriverExtra); + return dmA; +} + /*********************************************************************** * PRINTDLG_OpenDefaultPrinter * @@ -2635,6 +2676,43 @@ static void pagesetup_release_portname(const PageSetupDataA *pda, WCHAR *name) HeapFree(GetProcessHeap(), 0, name); } +static void pagesetup_set_devnames(PageSetupDataA *pda, LPCWSTR drv, LPCWSTR devname, LPCWSTR port) +{ + DEVNAMES *dn; + char *ptr; + WCHAR def[256]; + DWORD len = sizeof(DEVNAMES), drv_len, dev_len, port_len; + drv_len = WideCharToMultiByte(CP_ACP, 0, drv, -1, NULL, 0, NULL, NULL); + dev_len = WideCharToMultiByte(CP_ACP, 0, devname, -1, NULL, 0, NULL, NULL); + port_len = WideCharToMultiByte(CP_ACP, 0, port, -1, NULL, 0, NULL, NULL); + + len += drv_len + dev_len + port_len; + + pda->dlga->hDevNames = GlobalReAlloc(pda->dlga->hDevNames, len, GMEM_MOVEABLE); + dn = GlobalLock(pda->dlga->hDevNames); + + ptr = (char *)(dn + 1); + len = sizeof(DEVNAMES); + dn->wDriverOffset = len; + WideCharToMultiByte(CP_ACP, 0, drv, -1, ptr, drv_len, NULL, NULL); + ptr += drv_len; + len += drv_len; + dn->wDeviceOffset = len; + WideCharToMultiByte(CP_ACP, 0, devname, -1, ptr, dev_len, NULL, NULL); + ptr += dev_len; + len += dev_len; + dn->wOutputOffset = len; + WideCharToMultiByte(CP_ACP, 0, port, -1, ptr, port_len, NULL, NULL); + + dn->wDefault = 0; + len = sizeof(def) / sizeof(def[0]); + GetDefaultPrinterW(def, &len); + if(!lstrcmpW(def, devname)) + dn->wDefault = 1; + + GlobalUnlock(pda->dlga->hDevNames); +} + static DEVMODEW *pagesetup_get_devmode(const PageSetupDataA *pda) { DEVMODEA *dm; @@ -2651,6 +2729,20 @@ static void pagesetup_release_devmode(const PageSetupDataA *pda, DEVMODEW *dm) HeapFree(GetProcessHeap(), 0, dm); } +static void pagesetup_set_devmode(PageSetupDataA *pda, DEVMODEW *dm) +{ + DEVMODEA *dmA, *tmp_dm; + + tmp_dm = convert_to_devmodeA(dm); + pda->dlga->hDevMode = GlobalReAlloc(pda->dlga->hDevMode, + tmp_dm->dmSize + tmp_dm->dmDriverExtra, + GMEM_MOVEABLE); + dmA = GlobalLock(pda->dlga->hDevMode); + memcpy(dmA, tmp_dm, tmp_dm->dmSize + tmp_dm->dmDriverExtra); + GlobalUnlock(pda->dlga->hDevMode); + HeapFree(GetProcessHeap(), 0, tmp_dm); +} + static BOOL pagesetup_update_papersize(PageSetupDataA *pda) { DEVMODEW *dm; @@ -2771,69 +2863,58 @@ PRINTDLG_PS_UpdateDlgStructW(HWND hDlg, PageSetupDataW *pdw) { } /********************************************************************************************** - * PRINTDLG_PS_ChangeActivePrinerA + * pagesetup_change_printer * * Redefines hDevMode and hDevNames HANDLES and initialises it. * - * PARAMS - * name [in] Name of a printer for activation - * pda [in/out] ptr to PageSetupDataA structure - * - * RETURN - * TRUE if success - * FALSE if fail */ -static BOOL -PRINTDLG_PS_ChangeActivePrinterA(LPSTR name, PageSetupDataA *pda){ - HANDLE hprn; - DWORD needed; - LPPRINTER_INFO_2A lpPrinterInfo; - LPDRIVER_INFO_3A lpDriverInfo; - DEVMODEA *pDevMode, *dm; - - if(!OpenPrinterA(name, &hprn, NULL)){ - ERR("Can't open printer %s\n", name); - return FALSE; - } - GetPrinterA(hprn, 2, NULL, 0, &needed); - lpPrinterInfo = HeapAlloc(GetProcessHeap(), 0, needed); - GetPrinterA(hprn, 2, (LPBYTE)lpPrinterInfo, needed, &needed); - GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed); - lpDriverInfo = HeapAlloc(GetProcessHeap(), 0, needed); - if(!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)lpDriverInfo, needed, &needed)) { - ERR("GetPrinterDriverA failed for %s, fix your config!\n", lpPrinterInfo->pPrinterName); - HeapFree(GetProcessHeap(), 0, lpDriverInfo); - HeapFree(GetProcessHeap(), 0, lpPrinterInfo); - return FALSE; - } - ClosePrinter(hprn); - - needed = DocumentPropertiesA(0, 0, name, NULL, NULL, 0); - if(needed == -1) { - ERR("DocumentProperties fails on %s\n", debugstr_a(name)); - HeapFree(GetProcessHeap(), 0, lpDriverInfo); - HeapFree(GetProcessHeap(), 0, lpPrinterInfo); - return FALSE; - } - pDevMode = HeapAlloc(GetProcessHeap(), 0, needed); - DocumentPropertiesA(0, 0, name, pDevMode, NULL, DM_OUT_BUFFER); +static BOOL pagesetup_change_printer(LPWSTR name, PageSetupDataA *pda) +{ + HANDLE hprn; + DWORD needed; + PRINTER_INFO_2W *prn_info = NULL; + DRIVER_INFO_3W *drv_info = NULL; + DEVMODEW *dm = NULL; + BOOL retval = FALSE; - pda->dlga->hDevMode = GlobalReAlloc(pda->dlga->hDevMode, - pDevMode->dmSize + pDevMode->dmDriverExtra, - GMEM_MOVEABLE); - dm = GlobalLock(pda->dlga->hDevMode); - memcpy(dm, pDevMode, pDevMode->dmSize + pDevMode->dmDriverExtra); - - PRINTDLG_CreateDevNames(&(pda->dlga->hDevNames), - lpDriverInfo->pDriverPath, - lpPrinterInfo->pPrinterName, - lpPrinterInfo->pPortName); - - GlobalUnlock(pda->dlga->hDevMode); - HeapFree(GetProcessHeap(), 0, pDevMode); - HeapFree(GetProcessHeap(), 0, lpPrinterInfo); - HeapFree(GetProcessHeap(), 0, lpDriverInfo); - return TRUE; + if(!OpenPrinterW(name, &hprn, NULL)) + { + ERR("Can't open printer %s\n", debugstr_w(name)); + goto end; + } + + GetPrinterW(hprn, 2, NULL, 0, &needed); + prn_info = HeapAlloc(GetProcessHeap(), 0, needed); + GetPrinterW(hprn, 2, (LPBYTE)prn_info, needed, &needed); + GetPrinterDriverW(hprn, NULL, 3, NULL, 0, &needed); + drv_info = HeapAlloc(GetProcessHeap(), 0, needed); + if(!GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)drv_info, needed, &needed)) + { + ERR("GetPrinterDriverA failed for %s, fix your config!\n", debugstr_w(prn_info->pPrinterName)); + goto end; + } + ClosePrinter(hprn); + + needed = DocumentPropertiesW(0, 0, name, NULL, NULL, 0); + if(needed == -1) + { + ERR("DocumentProperties fails on %s\n", debugstr_w(name)); + goto end; + } + + dm = HeapAlloc(GetProcessHeap(), 0, needed); + DocumentPropertiesW(0, 0, name, dm, NULL, DM_OUT_BUFFER); + + pagesetup_set_devmode(pda, dm); + pagesetup_set_devnames(pda, drv_info->pDriverPath, prn_info->pPrinterName, + prn_info->pPortName); + + retval = TRUE; +end: + HeapFree(GetProcessHeap(), 0, dm); + HeapFree(GetProcessHeap(), 0, prn_info); + HeapFree(GetProcessHeap(), 0, drv_info); + return retval; } /**************************************************************************************** @@ -3117,13 +3198,14 @@ PRINTDLG_PS_WMCommandA( } break; case cmb1: /* Printer combo */ - if(msg == CBN_SELCHANGE){ - char crPrinterName[256]; - GetDlgItemTextA(hDlg, id, crPrinterName, 255); - PRINTDLG_PS_ChangeActivePrinterA(crPrinterName, pda); - pagesetup_init_combos(hDlg, pda); - } - break; + if(msg == CBN_SELCHANGE) + { + WCHAR name[256]; + GetDlgItemTextW(hDlg, id, name, sizeof(name) / sizeof(name[0])); + pagesetup_change_printer(name, pda); + pagesetup_init_combos(hDlg, pda); + } + break; case cmb2: /* Paper combo */ if(msg == CBN_SELCHANGE) {

1 0

Huw Davies : comdlg32: Move invocation of the Printer... dialog to a separate function.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: b2258d8324aeb594a71679d3714a95defbee5610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2258d8324aeb594a71679d37… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 21 10:45:19 2009 +0000 comdlg32: Move invocation of the Printer... dialog to a separate function. --- dlls/comdlg32/printdlg.c | 95 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 77 insertions(+), 18 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 2b939f3..412c343 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2638,6 +2638,25 @@ static void pagesetup_set_defaultsource(PageSetupDataA *pda, WORD source) GlobalUnlock(pda->dlga->hDevMode); } +static WCHAR *pagesetup_get_drvname(const PageSetupDataA *pda) +{ + DEVNAMES *dn; + int len; + WCHAR *name; + + dn = GlobalLock(pda->dlga->hDevNames); + len = MultiByteToWideChar(CP_ACP, 0, (char*)dn + dn->wDriverOffset, -1, NULL, 0); + name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, (char*)dn + dn->wDriverOffset, -1, name, len); + GlobalUnlock(pda->dlga->hDevNames); + return name; +} + +static void pagesetup_release_drvname(const PageSetupDataA *pda, WCHAR *name) +{ + HeapFree(GetProcessHeap(), 0, name); +} + static WCHAR *pagesetup_get_devname(const PageSetupDataA *pda) { DEVNAMES *dn; @@ -2941,6 +2960,59 @@ static void pagesetup_init_combos(HWND hDlg, PageSetupDataA *pda) pagesetup_release_devmode(pda, dm); } + +/**************************************************************************************** + * pagesetup_change_printer_dialog + * + * Pops up another dialog that lets the user pick another printer. + * + * For now we display the PrintDlg, this should display a striped down version of it. + */ +static void pagesetup_change_printer_dialog(HWND hDlg, PageSetupDataA *pda) +{ + PRINTDLGW prnt; + LPWSTR drvname, devname, portname; + DEVMODEW *tmp_dm, *dm; + + memset(&prnt, 0, sizeof(prnt)); + prnt.lStructSize = sizeof(prnt); + prnt.Flags = 0; + prnt.hwndOwner = hDlg; + + drvname = pagesetup_get_drvname(pda); + devname = pagesetup_get_devname(pda); + portname = pagesetup_get_portname(pda); + prnt.hDevNames = 0; + PRINTDLG_CreateDevNamesW(&prnt.hDevNames, drvname, devname, portname); + pagesetup_release_portname(pda, portname); + pagesetup_release_devname(pda, devname); + pagesetup_release_drvname(pda, drvname); + + tmp_dm = pagesetup_get_devmode(pda); + prnt.hDevMode = GlobalAlloc(GMEM_MOVEABLE, tmp_dm->dmSize + tmp_dm->dmDriverExtra); + dm = GlobalLock(prnt.hDevMode); + memcpy(dm, tmp_dm, tmp_dm->dmSize + tmp_dm->dmDriverExtra); + GlobalUnlock(prnt.hDevMode); + pagesetup_release_devmode(pda, tmp_dm); + + if (PrintDlgW(&prnt)) + { + DEVMODEW *dm = GlobalLock(prnt.hDevMode); + DEVNAMES *dn = GlobalLock(prnt.hDevNames); + + pagesetup_set_devnames(pda, (WCHAR*)dn + dn->wDriverOffset, + (WCHAR*)dn + dn->wDeviceOffset, (WCHAR *)dn + dn->wOutputOffset); + pagesetup_set_devmode(pda, dm); + GlobalUnlock(prnt.hDevNames); + GlobalUnlock(prnt.hDevMode); + pagesetup_init_combos(hDlg, pda); + } + + GlobalFree(prnt.hDevMode); + GlobalFree(prnt.hDevNames); + +} + static void PRINTDLG_PS_SetOrientationW(HWND hDlg, PageSetupDataW* pdw) { WCHAR PaperName[64]; @@ -3168,25 +3240,12 @@ PRINTDLG_PS_WMCommandA( EndDialog(hDlg, FALSE); return FALSE ; - case psh3: - { - PRINTDLGA prnt; - memset(&prnt, 0, sizeof(prnt)); - prnt.lStructSize = sizeof(prnt); - prnt.Flags = 0; - prnt.hwndOwner = hDlg; - prnt.hDevNames = pda->dlga->hDevNames; - prnt.hDevMode = pda->dlga->hDevMode; - if (PrintDlgA(&prnt)) - { - pda->dlga->hDevNames = prnt.hDevNames; - pda->dlga->hDevMode = prnt.hDevMode; - pagesetup_init_combos(hDlg, pda); - } + case psh3: /* Printer... */ + pagesetup_change_printer_dialog(hDlg, pda); return TRUE; - } - case rad1: - case rad2: + + case rad1: /* Portrait */ + case rad2: /* Landscape */ if((id == rad1 && pagesetup_get_orientation(pda) == DMORIENT_LANDSCAPE) || (id == rad2 && pagesetup_get_orientation(pda) == DMORIENT_PORTRAIT)) {

1 0

Huw Davies : comdlg32: Use unicode APIs to access the paper combos.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: 11d389e3d456286005c38d6f953fa7389a5322ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d389e3d456286005c38d6f9… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 20 12:01:16 2009 +0000 comdlg32: Use unicode APIs to access the paper combos. --- dlls/comdlg32/printdlg.c | 44 +++++++++++++++++++++++--------------------- 1 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 25bea64..35aa1ca 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3125,23 +3125,24 @@ PRINTDLG_PS_WMCommandA( } break; case cmb2: /* Paper combo */ - if(msg == CBN_SELCHANGE){ - DWORD paperword = SendDlgItemMessageA(hDlg,cmb2,CB_GETITEMDATA, - SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0), 0); + if(msg == CBN_SELCHANGE) + { + DWORD paperword = SendDlgItemMessageW(hDlg, cmb2, CB_GETITEMDATA, + SendDlgItemMessageW(hDlg, cmb2, CB_GETCURSEL, 0, 0), 0); if (paperword != CB_ERR) { pagesetup_set_papersize(pda, paperword); pagesetup_update_papersize(pda); PRINTDLG_PS_ChangePaperPrev(pda); } else - FIXME("could not get dialog text for papersize cmbbox?\n"); - } - break; + FIXME("could not get dialog text for papersize cmbbox?\n"); + } + break; case cmb3: /* Paper Source */ if(msg == CBN_SELCHANGE) { - WORD source = SendDlgItemMessageA(hDlg, cmb3, CB_GETITEMDATA, - SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0), 0); + WORD source = SendDlgItemMessageW(hDlg, cmb3, CB_GETITEMDATA, + SendDlgItemMessageW(hDlg, cmb3, CB_GETCURSEL, 0, 0), 0); pagesetup_set_defaultsource(pda, source); } break; @@ -3161,6 +3162,7 @@ PRINTDLG_PS_WMCommandA( dm = GlobalLock(pda->dlga->hDevMode); DocumentPropertiesA(hDlg, hPrinter, PrinterName, dm, dm, DM_IN_BUFFER | DM_OUT_BUFFER | DM_IN_PROMPT); + GlobalUnlock(pda->dlga->hDevMode); ClosePrinter(hPrinter); /* Changing paper */ pagesetup_update_papersize(pda); @@ -3169,20 +3171,20 @@ PRINTDLG_PS_WMCommandA( /* Changing paper preview */ PRINTDLG_PS_ChangePaperPrev(pda); /* Selecting paper in combo */ - count = SendDlgItemMessageA(hDlg, cmb2, CB_GETCOUNT, 0, 0); - if(count != CB_ERR) { + count = SendDlgItemMessageW(hDlg, cmb2, CB_GETCOUNT, 0, 0); + if(count != CB_ERR) + { WORD paperword = pagesetup_get_papersize(pda); - for(i=0; i<count; ++i){ - if(SendDlgItemMessageA(hDlg, cmb2, CB_GETITEMDATA, i, 0) == paperword) { - SendDlgItemMessageA(hDlg, cmb2, CB_SETCURSEL, i, 0); - break; - } - } - } - - GlobalUnlock(pda->dlga->hDevMode); - break; - } + for(i = 0; i < count; i++) + { + if(SendDlgItemMessageW(hDlg, cmb2, CB_GETITEMDATA, i, 0) == paperword) { + SendDlgItemMessageW(hDlg, cmb2, CB_SETCURSEL, i, 0); + break; + } + } + } + break; + } case edt4: case edt5: case edt6:

1 0

Huw Davies : comdlg32: Use unicode APIs in pagesetup_update_papersize.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: c2cd6f6efe0d14b8509d5b1cabc4db1f67eec318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2cd6f6efe0d14b8509d5b1ca… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 20 12:06:46 2009 +0000 comdlg32: Use unicode APIs in pagesetup_update_papersize. --- dlls/comdlg32/printdlg.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 35aa1ca..a07a723 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2653,38 +2653,36 @@ static void pagesetup_release_devmode(const PageSetupDataA *pda, DEVMODEW *dm) static BOOL pagesetup_update_papersize(PageSetupDataA *pda) { - DEVNAMES *dn; - DEVMODEA *dm; - LPSTR devname, portname; + DEVMODEW *dm; + LPWSTR devname, portname; int i, num; WORD *words = NULL, paperword; POINT *points = NULL; BOOL retval = FALSE; - dn = GlobalLock(pda->dlga->hDevNames); - dm = GlobalLock(pda->dlga->hDevMode); - devname = ((char*)dn)+dn->wDeviceOffset; - portname = ((char*)dn)+dn->wOutputOffset; + dm = pagesetup_get_devmode(pda); + devname = pagesetup_get_devname(pda); + portname = pagesetup_get_portname(pda); - num = DeviceCapabilitiesA(devname, portname, DC_PAPERS, NULL, dm); + num = DeviceCapabilitiesW(devname, portname, DC_PAPERS, NULL, dm); if (num <= 0) { - FIXME("No papernames found for %s/%s\n", devname, portname); + FIXME("No papernames found for %s/%s\n", debugstr_w(devname), debugstr_w(portname)); goto end; } words = HeapAlloc(GetProcessHeap(), 0, num * sizeof(WORD)); points = HeapAlloc(GetProcessHeap(), 0, num * sizeof(POINT)); - if (num != DeviceCapabilitiesA(devname, portname, DC_PAPERS, (LPSTR)words, dm)) + if (num != DeviceCapabilitiesW(devname, portname, DC_PAPERS, (LPWSTR)words, dm)) { FIXME("Number of returned words is not %d\n", num); goto end; } - if (num != DeviceCapabilitiesA(devname, portname, DC_PAPERSIZE, (LPSTR)points, dm)) + if (num != DeviceCapabilitiesW(devname, portname, DC_PAPERSIZE, (LPWSTR)points, dm)) { - FIXME("Number of returned sizes is not %d\n",num); + FIXME("Number of returned sizes is not %d\n", num); goto end; } @@ -2715,8 +2713,10 @@ static BOOL pagesetup_update_papersize(PageSetupDataA *pda) end: HeapFree(GetProcessHeap(), 0, words); HeapFree(GetProcessHeap(), 0, points); - GlobalUnlock(pda->dlga->hDevNames); - GlobalUnlock(pda->dlga->hDevMode); + pagesetup_release_portname(pda, portname); + pagesetup_release_devname(pda, devname); + pagesetup_release_devmode(pda, dm); + return retval; }

1 0

Huw Davies : comdlg32: Initialize the printer combobox using unicode strings.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: bb9494ba82835ee6f097a2efd0dffe8df18264e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb9494ba82835ee6f097a2efd… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 21 10:28:00 2009 +0000 comdlg32: Initialize the printer combobox using unicode strings. --- dlls/comdlg32/printdlg.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 146fe4f..168b9b6 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2597,6 +2597,20 @@ static void pagesetup_set_defaultsource(PageSetupDataA *pda, WORD source) GlobalUnlock(pda->dlga->hDevMode); } +static WCHAR *pagesetup_get_devname(const PageSetupDataA *pda) +{ + DEVNAMES *dn; + int len; + WCHAR *name; + + dn = GlobalLock(pda->dlga->hDevNames); + len = MultiByteToWideChar(CP_ACP, 0, (char*)dn + dn->wDeviceOffset, -1, NULL, 0); + name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, (char*)dn + dn->wDeviceOffset, -1, name, len); + GlobalUnlock(pda->dlga->hDevNames); + return name; +} + static BOOL pagesetup_update_papersize(PageSetupDataA *pda) { DEVNAMES *dn; @@ -2793,14 +2807,17 @@ static void pagesetup_init_combos(HWND hDlg, PageSetupDataA *pda) DEVNAMES *dn; DEVMODEA *dm; LPSTR devname,portname; + LPWSTR devnameW; dn = GlobalLock(pda->dlga->hDevNames); dm = GlobalLock(pda->dlga->hDevMode); + devnameW = pagesetup_get_devname(pda); devname = ((char*)dn)+dn->wDeviceOffset; portname = ((char*)dn)+dn->wOutputOffset; - PRINTDLG_SetUpPrinterListComboA(hDlg, cmb1, devname); + PRINTDLG_SetUpPrinterListComboW(hDlg, cmb1, devnameW); PRINTDLG_SetUpPaperComboBoxA(hDlg,cmb2,devname,portname,dm); PRINTDLG_SetUpPaperComboBoxA(hDlg,cmb3,devname,portname,dm); + HeapFree(GetProcessHeap(), 0, devnameW); GlobalUnlock(pda->dlga->hDevNames); GlobalUnlock(pda->dlga->hDevMode); }

1 0

Huw Davies : comdlg32: Initialize the paper comboboxes using unicode.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: 75829a9509e3495869f13b793248f9d9431373f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75829a9509e3495869f13b793… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 21 10:30:26 2009 +0000 comdlg32: Initialize the paper comboboxes using unicode. --- dlls/comdlg32/printdlg.c | 68 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 53 insertions(+), 15 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 168b9b6..25bea64 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2611,6 +2611,46 @@ static WCHAR *pagesetup_get_devname(const PageSetupDataA *pda) return name; } +static void pagesetup_release_devname(const PageSetupDataA *pda, WCHAR *name) +{ + HeapFree(GetProcessHeap(), 0, name); +} + +static WCHAR *pagesetup_get_portname(const PageSetupDataA *pda) +{ + DEVNAMES *dn; + int len; + WCHAR *name; + + dn = GlobalLock(pda->dlga->hDevNames); + len = MultiByteToWideChar(CP_ACP, 0, (char*)dn + dn->wOutputOffset, -1, NULL, 0); + name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, (char*)dn + dn->wOutputOffset, -1, name, len); + GlobalUnlock(pda->dlga->hDevNames); + return name; +} + +static void pagesetup_release_portname(const PageSetupDataA *pda, WCHAR *name) +{ + HeapFree(GetProcessHeap(), 0, name); +} + +static DEVMODEW *pagesetup_get_devmode(const PageSetupDataA *pda) +{ + DEVMODEA *dm; + DEVMODEW *dmW; + + dm = GlobalLock(pda->dlga->hDevMode); + dmW = GdiConvertToDevmodeW(dm); + GlobalUnlock(pda->dlga->hDevMode); + return dmW; +} + +static void pagesetup_release_devmode(const PageSetupDataA *pda, DEVMODEW *dm) +{ + HeapFree(GetProcessHeap(), 0, dm); +} + static BOOL pagesetup_update_papersize(PageSetupDataA *pda) { DEVNAMES *dn; @@ -2804,22 +2844,20 @@ PRINTDLG_PS_ChangeActivePrinterA(LPSTR name, PageSetupDataA *pda){ */ static void pagesetup_init_combos(HWND hDlg, PageSetupDataA *pda) { - DEVNAMES *dn; - DEVMODEA *dm; - LPSTR devname,portname; - LPWSTR devnameW; + DEVMODEW *dm; + LPWSTR devname, portname; - dn = GlobalLock(pda->dlga->hDevNames); - dm = GlobalLock(pda->dlga->hDevMode); - devnameW = pagesetup_get_devname(pda); - devname = ((char*)dn)+dn->wDeviceOffset; - portname = ((char*)dn)+dn->wOutputOffset; - PRINTDLG_SetUpPrinterListComboW(hDlg, cmb1, devnameW); - PRINTDLG_SetUpPaperComboBoxA(hDlg,cmb2,devname,portname,dm); - PRINTDLG_SetUpPaperComboBoxA(hDlg,cmb3,devname,portname,dm); - HeapFree(GetProcessHeap(), 0, devnameW); - GlobalUnlock(pda->dlga->hDevNames); - GlobalUnlock(pda->dlga->hDevMode); + dm = pagesetup_get_devmode(pda); + devname = pagesetup_get_devname(pda); + portname = pagesetup_get_portname(pda); + + PRINTDLG_SetUpPrinterListComboW(hDlg, cmb1, devname); + PRINTDLG_SetUpPaperComboBoxW(hDlg, cmb2, devname, portname, dm); + PRINTDLG_SetUpPaperComboBoxW(hDlg, cmb3, devname, portname, dm); + + pagesetup_release_portname(pda, portname); + pagesetup_release_devname(pda, devname); + pagesetup_release_devmode(pda, dm); } static void PRINTDLG_PS_SetOrientationW(HWND hDlg, PageSetupDataW* pdw)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLDocument5 createComment.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: bb983c824d1b2065bceeba219117e0861367a786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb983c824d1b2065bceeba219… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 16 19:59:28 2009 +1100 mshtml: Implement IHTMLDocument5 createComment. --- dlls/mshtml/htmldoc5.c | 28 ++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 24 +++++++++++++++++++++++- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc5.c b/dlls/mshtml/htmldoc5.c index 34dc4e0..bd54cc4 100644 --- a/dlls/mshtml/htmldoc5.c +++ b/dlls/mshtml/htmldoc5.c @@ -124,8 +124,32 @@ static HRESULT WINAPI HTMLDocument5_createComment(IHTMLDocument5 *iface, BSTR bs IHTMLDOMNode **ppRetNode) { HTMLDocument *This = HTMLDOC5_THIS(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrdata), ppRetNode); - return E_NOTIMPL; + nsIDOMComment *nscomment; + HTMLDOMNode *node; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrdata), ppRetNode); + + if(!This->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + nsAString_Init(&str, bstrdata); + nsres = nsIDOMHTMLDocument_CreateComment(This->nsdoc, &str, &nscomment); + nsAString_Finish(&str); + if(NS_FAILED(nsres)) { + ERR("CreateTextNode failed: %08x\n", nsres); + return E_FAIL; + } + + node = &HTMLCommentElement_Create(This, (nsIDOMNode*)nscomment)->node; + nsIDOMElement_Release(nscomment); + + *ppRetNode = HTMLDOMNODE(node); + IHTMLDOMNode_AddRef(HTMLDOMNODE(node)); + return S_OK; } static HRESULT WINAPI HTMLDocument5_put_onfocusin(IHTMLDocument5 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 777c425..e0a5f69 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3809,11 +3809,13 @@ static void test_elems(IHTMLDocument2 *doc) static void test_create_elems(IHTMLDocument2 *doc) { IHTMLElement *elem, *body, *elem2; - IHTMLDOMNode *node, *node2, *node3; + IHTMLDOMNode *node, *node2, *node3, *comment; + IHTMLDocument5 *doc5; IDispatch *disp; VARIANT var; long type; HRESULT hres; + BSTR str; static const elem_type_t types1[] = { ET_TESTG }; @@ -3868,6 +3870,26 @@ static void test_create_elems(IHTMLDocument2 *doc) test_elem_innertext(body, "insert test"); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); + if(hres == S_OK) + { + str = a2bstr("testing"); + hres = IHTMLDocument5_createComment(doc5, str, &comment); + SysFreeString(str); + ok(hres == S_OK, "createComment failed: %08x\n", hres); + if(hres == S_OK) + { + type = get_node_type((IUnknown*)comment); + ok(type == 8, "type=%ld, expected 8\n", type); + + test_node_get_value_str((IUnknown*)comment, "testing"); + + IHTMLDOMNode_Release(comment); + } + + IHTMLDocument5_Release(doc5); + } + IHTMLElement_Release(body); }

1 0

Huw Davies : comdlg32: Rename PRINTDLG_PS_ChangePrinterA to better reflect its function.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: 7d996fb739d7b1b66eeed3a42bd4e7a4c4489251 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d996fb739d7b1b66eeed3a42… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 20 10:35:02 2009 +0000 comdlg32: Rename PRINTDLG_PS_ChangePrinterA to better reflect its function. --- dlls/comdlg32/printdlg.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index ce8a071..146fe4f 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2783,29 +2783,26 @@ PRINTDLG_PS_ChangeActivePrinterA(LPSTR name, PageSetupDataA *pda){ } /**************************************************************************************** - * PRINTDLG_PS_ChangePrinterA + * pagesetup_init_combos * - * Fills Printers, Paper and Source combo + * Fills Printers, Paper and Source combos * - * RETURNS - * TRUE */ -static BOOL -PRINTDLG_PS_ChangePrinterA(HWND hDlg, PageSetupDataA *pda) { +static void pagesetup_init_combos(HWND hDlg, PageSetupDataA *pda) +{ DEVNAMES *dn; DEVMODEA *dm; LPSTR devname,portname; - + dn = GlobalLock(pda->dlga->hDevNames); dm = GlobalLock(pda->dlga->hDevMode); - devname = ((char*)dn)+dn->wDeviceOffset; - portname = ((char*)dn)+dn->wOutputOffset; + devname = ((char*)dn)+dn->wDeviceOffset; + portname = ((char*)dn)+dn->wOutputOffset; PRINTDLG_SetUpPrinterListComboA(hDlg, cmb1, devname); PRINTDLG_SetUpPaperComboBoxA(hDlg,cmb2,devname,portname,dm); PRINTDLG_SetUpPaperComboBoxA(hDlg,cmb3,devname,portname,dm); GlobalUnlock(pda->dlga->hDevNames); GlobalUnlock(pda->dlga->hDevMode); - return TRUE; } static void PRINTDLG_PS_SetOrientationW(HWND hDlg, PageSetupDataW* pdw) @@ -3048,7 +3045,7 @@ PRINTDLG_PS_WMCommandA( { pda->dlga->hDevNames = prnt.hDevNames; pda->dlga->hDevMode = prnt.hDevMode; - PRINTDLG_PS_ChangePrinterA(hDlg,pda); + pagesetup_init_combos(hDlg, pda); } return TRUE; } @@ -3069,7 +3066,7 @@ PRINTDLG_PS_WMCommandA( char crPrinterName[256]; GetDlgItemTextA(hDlg, id, crPrinterName, 255); PRINTDLG_PS_ChangeActivePrinterA(crPrinterName, pda); - PRINTDLG_PS_ChangePrinterA(hDlg, pda); + pagesetup_init_combos(hDlg, pda); } break; case cmb2: /* Paper combo */ @@ -3500,7 +3497,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) } /* filling combos: printer, paper, source. selecting current printer (from DEVMODEA) */ - PRINTDLG_PS_ChangePrinterA(hDlg, pda); + pagesetup_init_combos(hDlg, pda); pagesetup_update_papersize(pda); pagesetup_set_defaultsource(pda, DMBIN_FORMSOURCE); /* FIXME: This is the auto select bin. Is this correct? */

1 0

Jeff Latimer : user32: Pass pConv to WDML_Global2DataHandle so that it can be correcly passed to DdeCreateDataHandle .
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: be14da009afec010a5b08c45e1ef621b5809a39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=be14da009afec010a5b08c45e… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Jan 20 23:04:32 2009 +1100 user32: Pass pConv to WDML_Global2DataHandle so that it can be correcly passed to DdeCreateDataHandle. --- dlls/user32/dde_client.c | 4 ++-- dlls/user32/dde_misc.c | 6 +++--- dlls/user32/dde_private.h | 2 +- dlls/user32/dde_server.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index c052b83..12856cc 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -527,7 +527,7 @@ static WDML_QUEUE_STATE WDML_HandleRequestReply(WDML_CONV* pConv, MSG* msg, WDML if (DdeCmpStringHandles(hsz, pXAct->hszItem) != 0) return WDML_QS_PASS; - pXAct->hDdeData = WDML_Global2DataHandle((HGLOBAL)uiLo, &wdh); + pXAct->hDdeData = WDML_Global2DataHandle(pConv, (HGLOBAL)uiLo, &wdh); if (wdh.fRelease) { GlobalFree((HGLOBAL)uiLo); @@ -850,7 +850,7 @@ static WDML_QUEUE_STATE WDML_HandleIncomingData(WDML_CONV* pConv, MSG* msg, HDDE UnpackDDElParam(WM_DDE_DATA, msg->lParam, &uiLo, &uiHi); hsz = WDML_MakeHszFromAtom(pConv->instance, uiHi); - hDdeDataIn = WDML_Global2DataHandle((HGLOBAL)uiLo, &wdh); + hDdeDataIn = WDML_Global2DataHandle(pConv, (HGLOBAL)uiLo, &wdh); /* billx: * For hot link, data should be passed to its callback with diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index 2f69e84..89a6bb0 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -1479,7 +1479,7 @@ BOOL WDML_IsAppOwned(HDDEDATA hData) * 2 16 clipboard format * 4 ? data to be used */ -HDDEDATA WDML_Global2DataHandle(HGLOBAL hMem, WINE_DDEHEAD* p) +HDDEDATA WDML_Global2DataHandle(WDML_CONV* pConv, HGLOBAL hMem, WINE_DDEHEAD* p) { DDEDATA* pDd; HDDEDATA ret = 0; @@ -1500,7 +1500,7 @@ HDDEDATA WDML_Global2DataHandle(HGLOBAL hMem, WINE_DDEHEAD* p) /* fall thru */ case 0: case CF_TEXT: - ret = DdeCreateDataHandle(0, pDd->Value, size, 0, 0, pDd->cfFormat, 0); + ret = DdeCreateDataHandle(pConv->instance->instanceID, pDd->Value, size, 0, 0, pDd->cfFormat, 0); break; case CF_BITMAP: if (size >= sizeof(BITMAP)) @@ -1515,7 +1515,7 @@ HDDEDATA WDML_Global2DataHandle(HGLOBAL hMem, WINE_DDEHEAD* p) bmp->bmPlanes, bmp->bmBitsPixel, pDd->Value + sizeof(BITMAP)))) { - ret = DdeCreateDataHandle(0, (LPBYTE)&hbmp, sizeof(hbmp), + ret = DdeCreateDataHandle(pConv->instance->instanceID, (LPBYTE)&hbmp, sizeof(hbmp), 0, 0, CF_BITMAP, 0); } else ERR("Can't create bmp\n"); diff --git a/dlls/user32/dde_private.h b/dlls/user32/dde_private.h index 19e15b9..ed88ce3 100644 --- a/dlls/user32/dde_private.h +++ b/dlls/user32/dde_private.h @@ -232,7 +232,7 @@ extern void WDML_FreeTransaction(WDML_INSTANCE* pInstance, WDML_XACT* pXAct, BO extern WDML_XACT* WDML_FindTransaction(WDML_CONV* pConv, DWORD tid) DECLSPEC_HIDDEN; extern HGLOBAL WDML_DataHandle2Global(HDDEDATA hDdeData, BOOL fResponse, BOOL fRelease, BOOL fDeferUpd, BOOL dAckReq) DECLSPEC_HIDDEN; -extern HDDEDATA WDML_Global2DataHandle(HGLOBAL hMem, WINE_DDEHEAD* da) DECLSPEC_HIDDEN; +extern HDDEDATA WDML_Global2DataHandle(WDML_CONV* pConv, HGLOBAL hMem, WINE_DDEHEAD* da) DECLSPEC_HIDDEN; extern BOOL WDML_IsAppOwned(HDDEDATA hDdeData) DECLSPEC_HIDDEN; extern WDML_INSTANCE* WDML_GetInstance(DWORD InstId) DECLSPEC_HIDDEN; extern WDML_INSTANCE* WDML_GetInstanceFromWnd(HWND hWnd) DECLSPEC_HIDDEN; diff --git a/dlls/user32/dde_server.c b/dlls/user32/dde_server.c index f2bb8b6..52adb9a 100644 --- a/dlls/user32/dde_server.c +++ b/dlls/user32/dde_server.c @@ -772,7 +772,7 @@ static WDML_QUEUE_STATE WDML_ServerHandleExecute(WDML_CONV* pConv, WDML_XACT* pX if (ptr) { - hDdeData = DdeCreateDataHandle(0, ptr, GlobalSize(pXAct->hMem), + hDdeData = DdeCreateDataHandle(pConv->instance->instanceID, ptr, GlobalSize(pXAct->hMem), 0, 0, CF_TEXT, 0); GlobalUnlock(pXAct->hMem); }

1 0

Dylan Smith : richedit: Implemented ITextServices TxGetText and TxSetText.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: 20d6bc8ac7e3b166fbb50337e59a7d2c2c23ef7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=20d6bc8ac7e3b166fbb50337e… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jan 20 01:41:44 2009 -0500 richedit: Implemented ITextServices TxGetText and TxSetText. --- dlls/riched20/Makefile.in | 2 +- dlls/riched20/tests/txtsrv.c | 12 ++++++------ dlls/riched20/txtsrv.c | 32 ++++++++++++++++++++++++++++---- 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in index 7f85120..d56137e 100644 --- a/dlls/riched20/Makefile.in +++ b/dlls/riched20/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = riched20.dll IMPORTLIB = riched20 -IMPORTS = uuid ole32 imm32 user32 gdi32 kernel32 +IMPORTS = uuid ole32 oleaut32 imm32 user32 gdi32 kernel32 C_SRCS = \ caret.c \ diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 05976ef..87cbebf 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -641,7 +641,7 @@ static void test_TxGetText(void) return; hres = ITextServices_TxGetText(txtserv, &rettext); - todo_wine ok(hres == S_OK, "ITextServices_TxGetText failed\n"); + ok(hres == S_OK, "ITextServices_TxGetText failed\n"); IUnknown_Release(txtserv); CoTaskMemFree(dummyTextHost); @@ -657,14 +657,14 @@ static void test_TxSetText(void) return; hres = ITextServices_TxSetText(txtserv, settext); - todo_wine ok(hres == S_OK, "ITextServices_TxSetText failed\n"); + ok(hres == S_OK, "ITextServices_TxSetText failed\n"); hres = ITextServices_TxGetText(txtserv, &rettext); - todo_wine ok(hres == S_OK, "ITextServices_TxGetText failed\n"); + ok(hres == S_OK, "ITextServices_TxGetText failed\n"); - todo_wine ok(SysStringLen(rettext) == 4, + ok(SysStringLen(rettext) == 4, "String returned of wrong length\n"); - todo_wine ok(memcmp(rettext,settext,SysStringByteLen(rettext)) == 0, + ok(memcmp(rettext,settext,SysStringByteLen(rettext)) == 0, "String returned differs\n"); IUnknown_Release(txtserv); @@ -717,7 +717,7 @@ void test_TxGetNaturalSize() { xdim = 0; ydim = 0; result = ITextServices_TxSetText(txtserv, oneA); - todo_wine ok(result == S_OK, "ITextServices_TxSetText failed\n"); + ok(result == S_OK, "ITextServices_TxSetText failed\n"); result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index f05e721..2d5ff81 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -27,6 +27,7 @@ #include "editor.h" #include "ole2.h" +#include "oleauto.h" #include "richole.h" #include "imm.h" #include "textserv.h" @@ -276,9 +277,23 @@ HRESULT WINAPI fnTextSrv_TxGetText(ITextServices *iface, BSTR* pbstrText) { ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + int length; - FIXME("%p: STUB\n", This); - return E_NOTIMPL; + length = ME_GetTextLength(This->editor); + if (length) + { + BSTR bstr; + bstr = SysAllocStringByteLen(NULL, length * sizeof(WCHAR)); + if (bstr == NULL) + return E_OUTOFMEMORY; + + ME_GetTextW(This->editor, bstr , 0, length, FALSE); + *pbstrText = bstr; + } else { + *pbstrText = NULL; + } + + return S_OK; } HRESULT WINAPI fnTextSrv_TxSetText(ITextServices *iface, @@ -286,8 +301,17 @@ HRESULT WINAPI fnTextSrv_TxSetText(ITextServices *iface, { ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - FIXME("%p: STUB\n", This); - return E_NOTIMPL; + ME_InternalDeleteText(This->editor, 0, ME_GetTextLength(This->editor), + FALSE); + ME_InsertTextFromCursor(This->editor, 0, pszText, -1, + This->editor->pBuffer->pDefaultStyle); + ME_SetSelection(This->editor, 0, 0); + This->editor->nModifyStep = 0; + OleFlushClipboard(); + ME_EmptyUndoStack(This->editor); + ME_UpdateRepaint(This->editor); + + return S_OK; } HRESULT WINAPI fnTextSrv_TxGetCurrentTargetX(ITextServices *iface,

1 0