October 2006 - Wine-commits

James Hawkins : msi: Only initialize a component' s state if it is linked with a feature.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 929395c0f0b7dbd1978adfea5079445228b6b7e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=929395c0f0b7dbd1978adfea5… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 19 15:51:33 2006 -0700 msi: Only initialize a component's state if it is linked with a feature. --- dlls/msi/action.c | 58 +++++++++++++++++++-------------------------- dlls/msi/tests/install.c | 11 +++++--- dlls/msi/tests/package.c | 35 +++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 37 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e81fcb7..8d79028 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1792,6 +1792,31 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa { component = cl->component; + switch (component->Attributes) + { + case msidbComponentAttributesLocalOnly: + component->Action = INSTALLSTATE_LOCAL; + component->ActionRequest = INSTALLSTATE_LOCAL; + break; + case msidbComponentAttributesSourceOnly: + component->Action = INSTALLSTATE_SOURCE; + component->ActionRequest = INSTALLSTATE_SOURCE; + break; + case msidbComponentAttributesOptional: + component->Action = INSTALLSTATE_DEFAULT; + component->ActionRequest = INSTALLSTATE_DEFAULT; + break; + default: + component->Action = INSTALLSTATE_LOCAL; + component->ActionRequest = INSTALLSTATE_LOCAL; + } + + if (component->ForceLocalState) + { + component->Action = INSTALLSTATE_LOCAL; + component->ActionRequest = INSTALLSTATE_LOCAL; + } + if (!component->Enabled) { component->Action = INSTALLSTATE_UNKNOWN; @@ -1907,33 +1932,6 @@ static UINT ITERATE_CostFinalizeConditio return ERROR_SUCCESS; } -static void load_all_component_states(MSIPACKAGE *package) -{ - MSICOMPONENT *comp; - - LIST_FOR_EACH_ENTRY(comp, &package->components, MSICOMPONENT, entry) - { - switch (comp->Attributes) - { - case msidbComponentAttributesLocalOnly: - comp->Action = INSTALLSTATE_LOCAL; - comp->ActionRequest = INSTALLSTATE_LOCAL; - break; - case msidbComponentAttributesSourceOnly: - comp->Action = INSTALLSTATE_SOURCE; - comp->ActionRequest = INSTALLSTATE_SOURCE; - break; - case msidbComponentAttributesOptional: - comp->Action = INSTALLSTATE_DEFAULT; - comp->ActionRequest = INSTALLSTATE_DEFAULT; - break; - default: - comp->Action = INSTALLSTATE_LOCAL; - comp->ActionRequest = INSTALLSTATE_LOCAL; - } - } -} - /* * A lot is done in this function aside from just the costing. * The costing needs to be implemented at some point but for now I am going @@ -1972,8 +1970,6 @@ static UINT ACTION_CostFinalize(MSIPACKA msiobj_release(&view->hdr); } - load_all_component_states(package); - TRACE("File calculations\n"); LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) @@ -1985,11 +1981,7 @@ static UINT ACTION_CostFinalize(MSIPACKA continue; if (file->IsCompressed) - { comp->ForceLocalState = TRUE; - comp->Action = INSTALLSTATE_LOCAL; - comp->ActionRequest = INSTALLSTATE_LOCAL; - } /* calculate target */ p = resolve_folder(package, comp->Directory, FALSE, FALSE, NULL); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3696537..fe856f7 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -664,10 +664,7 @@ static void test_MsiInstallProduct(void) size = MAX_PATH; type = REG_SZ; res = RegQueryValueExA(hkey, "blah", NULL, &type, (LPBYTE)path, &size); - todo_wine - { - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - } + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); size = sizeof(num); type = REG_DWORD; @@ -690,6 +687,7 @@ static void test_MsiInstallProduct(void) static void test_MsiSetComponentState(void) { + INSTALLSTATE installed, action; MSIHANDLE package; char path[MAX_PATH]; UINT r; @@ -714,6 +712,11 @@ static void test_MsiSetComponentState(vo r = MsiDoAction(package, "CostFinalize"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + r = MsiGetComponentState(package, "dangler", &installed, &action); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(installed == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", installed); + ok(action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + r = MsiSetComponentState(package, "dangler", INSTALLSTATE_SOURCE); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index f507451..feac142 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1585,6 +1585,10 @@ static void test_states(void) r = add_component_entry( hdb, "'eta', '{DD89003F-0DD4-41B8-81C0-3411A7DA2695}', 'TARGETDIR', 1, '', 'eta_file'" ); ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); + /* no feature parent:msidbComponentAttributesLocalOnly */ + r = add_component_entry( hdb, "'kappa', '{D6B93DC3-8DA5-4769-9888-42BFE156BB8B}', 'TARGETDIR', 1, '', 'kappa_file'" ); + ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); + r = create_feature_components_table( hdb ); ok( r == ERROR_SUCCESS, "cannot create FeatureComponents table: %d\n", r ); @@ -1652,6 +1656,9 @@ static void test_states(void) r = add_file_entry( hdb, "'eta_file', 'eta', 'eta.txt', 0, '', '1033', 16384, 1" ); ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); + r = add_file_entry( hdb, "'kappa_file', 'kappa', 'kappa.txt', 0, '', '1033', 8192, 1" ); + ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); + hpkg = package_from_db( hdb ); ok( hpkg, "failed to create package\n"); @@ -1755,6 +1762,13 @@ static void test_states(void) ok( state == 0xdeadbee, "Expected 0xdeadbee, got %d\n", state); ok( action == 0xdeadbee, "Expected 0xdeadbee, got %d\n", action); + state = 0xdeadbee; + action = 0xdeadbee; + r = MsiGetComponentState(hpkg, "kappa", &state, &action); + ok( r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r ); + ok( state == 0xdeadbee, "Expected 0xdeadbee, got %d\n", state); + ok( action == 0xdeadbee, "Expected 0xdeadbee, got %d\n", action); + r = MsiDoAction( hpkg, "CostInitialize"); ok( r == ERROR_SUCCESS, "cost init failed\n"); @@ -1856,6 +1870,13 @@ static void test_states(void) ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + state = 0xdeadbee; + action = 0xdeadbee; + r = MsiGetComponentState(hpkg, "kappa", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + r = MsiDoAction( hpkg, "FileCost"); ok( r == ERROR_SUCCESS, "file cost failed\n"); @@ -1957,6 +1978,13 @@ static void test_states(void) ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + state = 0xdeadbee; + action = 0xdeadbee; + r = MsiGetComponentState(hpkg, "kappa", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + r = MsiDoAction( hpkg, "CostFinalize"); ok( r == ERROR_SUCCESS, "cost finalize failed: %d\n", r); @@ -2057,6 +2085,13 @@ static void test_states(void) ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); + + state = 0xdeadbee; + action = 0xdeadbee; + r = MsiGetComponentState(hpkg, "kappa", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); MsiCloseHandle( hpkg ); DeleteFileA( msifile );

1 0

Huw Davies : oledlg: Set nSelectedIndex on exit.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 8711d5e6b1900a62238498d1f51996406dd4d3c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8711d5e6b1900a62238498d1f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 19 11:42:03 2006 +0100 oledlg: Set nSelectedIndex on exit. --- dlls/oledlg/pastespl.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index ff3a8b5..b4d5f97 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -236,7 +236,7 @@ static DWORD init_pastelist(HWND hdlg, O DWORD src_fmt, req_fmt; for(req_fmt = 0; req_fmt < ps->cPasteEntries; req_fmt++) { - /* This is used by update_struct() to set nSelectedIndex on exit */ + /* This is used by update_structure() to set nSelectedIndex on exit */ ps->arrPasteEntries[req_fmt].dwScratchSpace = req_fmt; TRACE("req_fmt %x\n", ps->arrPasteEntries[req_fmt].fmtetc.cfFormat); for(src_fmt = 0; src_fmt < fetched; src_fmt++) @@ -465,6 +465,13 @@ static void send_end_dialog_msg(HWND hdl static void update_structure(HWND hdlg, ps_struct_t *ps_struct) { + LONG cur_sel = SendMessageW(GetDlgItem(hdlg, IDC_PS_DISPLAYLIST), LB_GETCURSEL, 0, 0); + if(cur_sel != -1) + { + OLEUIPASTEENTRYW *pent; + pent = (OLEUIPASTEENTRYW *)SendMessageW(GetDlgItem(hdlg, IDC_PS_DISPLAYLIST), LB_GETITEMDATA, cur_sel, 0); + ps_struct->ps->nSelectedIndex = pent->dwScratchSpace; + } ps_struct->ps->dwFlags = ps_struct->flags; ps_struct->ps->fLink = (ps_struct->flags & PSF_SELECTPASTELINK) ? TRUE : FALSE; }

1 0

Huw Davies : oledlg: Update the source text.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: feeaf9c238d7de41139f671695235bd0a1cee48c URL: http://source.winehq.org/git/wine.git/?a=commit;h=feeaf9c238d7de41139f67169… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 19 11:45:24 2006 +0100 oledlg: Update the source text. --- dlls/oledlg/pastespl.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index b4d5f97..08b7f95 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -364,6 +364,29 @@ static void init_lists(HWND hdlg, ps_str EnableWindow(GetDlgItem(hdlg, IDOK), 0); } +static void update_src_text(HWND hdlg, ps_struct_t *ps_struct) +{ + WCHAR *str; + + if(ps_struct->flags & PSF_SELECTPASTE) + { + if(ps_struct->source_name) + str = ps_struct->source_name; + else + str = ps_struct->link_source_name; + + } + else + { + if(ps_struct->link_source_name) + str = ps_struct->link_source_name; + else + str = ps_struct->source_name; + + } + SetDlgItemTextW(hdlg, IDC_PS_SOURCETEXT, str); +} + static void update_as_icon(HWND hdlg, ps_struct_t *ps_struct) { HWND icon_display = GetDlgItem(hdlg, IDC_PS_ICONDISPLAY); @@ -449,6 +472,7 @@ static void mode_change(HWND hdlg, ps_st ps_struct->flags |= PSF_SELECTPASTELINK; } + update_src_text(hdlg, ps_struct); update_display_list(hdlg, id == IDC_PS_PASTE ? IDC_PS_PASTELIST : IDC_PS_PASTELINKLIST); selection_change(hdlg, ps_struct); } @@ -537,6 +561,8 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND init_lists(hdlg, ps_struct); + update_src_text(hdlg, ps_struct); + selection_change(hdlg, ps_struct); SetFocus(GetDlgItem(hdlg, IDC_PS_DISPLAYLIST));

1 0

Huw Davies : oledlg: Return the appropiate value after the dialog is closed .
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 5f71b16d07c1b989c1854fab0787ceb4a8bd0f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f71b16d07c1b989c1854fab0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 19 12:11:51 2006 +0100 oledlg: Return the appropiate value after the dialog is closed. --- dlls/oledlg/pastespl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 08b7f95..7bb7435 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -687,6 +687,7 @@ UINT WINAPI OleUIPasteSpecialA(LPOLEUIPA UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW ps) { LPCDLGTEMPLATEW dlg_templ = (LPCDLGTEMPLATEW)ps->hResource; + UINT ret; TRACE("(%p)\n", ps); @@ -708,8 +709,7 @@ UINT WINAPI OleUIPasteSpecialW(LPOLEUIPA if(!dlg_templ) return OLEUI_ERR_LOADTEMPLATEFAILURE; } - DialogBoxIndirectParamW(OLEDLG_hInstance, dlg_templ, ps->hWndOwner, ps_dlg_proc, (LPARAM)ps); + ret = DialogBoxIndirectParamW(OLEDLG_hInstance, dlg_templ, ps->hWndOwner, ps_dlg_proc, (LPARAM)ps); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return OLEUI_FALSE; + return ret; }

1 0

Huw Davies : oledlg: Remove the structure window property when we quit.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 04662b8c453a0e9236aefd2083e95b3e8cbb9cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04662b8c453a0e9236aefd208… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 19 12:44:43 2006 +0100 oledlg: Remove the structure window property when we quit. --- dlls/oledlg/pastespl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 7bb7435..ccfceca 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -615,6 +615,8 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND if(wp == IDOK) update_structure(hdlg, ps_struct); EndDialog(hdlg, wp); + /* native does its cleanup in WM_DESTROY */ + RemovePropW(hdlg, prop_name); free_structure(ps_struct); return TRUE; }

1 0

Detlef Riekenberg : localspl/tests: Another test for InitializePrintMonitor .
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: ef78da2d5a08c4e68b8d29d030a5b15bd63c268c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef78da2d5a08c4e68b8d29d03… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Oct 19 23:27:28 2006 +0200 localspl/tests: Another test for InitializePrintMonitor. --- dlls/localspl/tests/localmon.c | 33 +++++++++++++++++++++++++++------ 1 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 72a7048..60d07b7 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -35,19 +35,26 @@ #include "wine/test.h" /* ##### */ -static HANDLE hdll; +static HMODULE hdll; static LPMONITOREX (WINAPI *pInitializePrintMonitor)(LPWSTR); -static const WCHAR emptyW[] = {0}; - +static LPMONITOREX pm; + +static WCHAR emptyW[] = {0}; +static WCHAR Monitors_LocalPortW[] = { \ + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'P','r','i','n','t','\\', + 'M','o','n','i','t','o','r','s','\\', + 'L','o','c','a','l',' ','P','o','r','t',0}; + /* ##### */ static void test_InitializePrintMonitor(void) { LPMONITOREX res; - if (!pInitializePrintMonitor) return; - SetLastError(0xdeadbeef); res = pInitializePrintMonitor(NULL); ok( (res == NULL) && (GetLastError() == ERROR_INVALID_PARAMETER), @@ -55,18 +62,32 @@ static void test_InitializePrintMonitor( "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); SetLastError(0xdeadbeef); - res = pInitializePrintMonitor((LPWSTR) emptyW); + res = pInitializePrintMonitor(emptyW); ok( (res == NULL) && (GetLastError() == ERROR_INVALID_PARAMETER), "returned %p with %d\n (expected NULL with " \ "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); + + /* Every call with a non-empty string returns the same Pointer */ + SetLastError(0xdeadbeef); + res = pInitializePrintMonitor(Monitors_LocalPortW); + ok( res == pm, + "returned %p with %d (expected %p)\n", res, GetLastError(), pm); } START_TEST(localmon) { + /* This DLL does not exists on Win9x */ hdll = LoadLibraryA("localspl.dll"); if (!hdll) return; pInitializePrintMonitor = (void *) GetProcAddress(hdll, "InitializePrintMonitor"); + if (!pInitializePrintMonitor) return; + + /* Native localmon.dll / localspl.dll need a vaild Port-Entry in: + a) since xp: HKLM\Software\Microsoft\Windows NT\CurrentVersion\Ports + b) upto w2k: Section "Ports" in win.ini + or InitializePrintMonitor fails. */ + pm = pInitializePrintMonitor(Monitors_LocalPortW); test_InitializePrintMonitor(); }

1 0

Huw Davies : oledlg: Call the hook proc if present.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: ddaa4801a952bf1ac3478d5dbacd65d76145bbdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddaa4801a952bf1ac3478d5db… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 19 11:27:07 2006 +0100 oledlg: Call the hook proc if present. --- dlls/oledlg/pastespl.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index ece44fd..d4cdadc 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -415,6 +415,12 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND { if(!ps_struct) return 0; + + if(ps_struct->ps->lpfnHook) + { + INT_PTR ret = ps_struct->ps->lpfnHook(hdlg, msg, wp, lp); + if(ret) return ret; + } } switch(msg) @@ -442,6 +448,8 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND SetFocus(GetDlgItem(hdlg, IDC_PS_DISPLAYLIST)); + if(ps_struct->ps->lpfnHook) + ps_struct->ps->lpfnHook(hdlg, msg, 0, 0); return FALSE; /* use new focus */ } case WM_COMMAND:

1 0

Huw Davies : oledlg: Retrieve names from the OBJECTDESCRIPTOR structure.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 39131cf5450af8c88148197af359d43df9126e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39131cf5450af8c88148197af… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 19 11:40:54 2006 +0100 oledlg: Retrieve names from the OBJECTDESCRIPTOR structure. --- dlls/oledlg/pastespl.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 86 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index d4cdadc..ff3a8b5 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -20,6 +20,8 @@ #define COM_NO_WINDOWS_H #define COBJMACROS +#define NONAMELESSSTRUCT +#define NONAMELESSUNION #include <stdarg.h> @@ -43,6 +45,11 @@ typedef struct { OLEUIPASTESPECIALW *ps; DWORD flags; + WCHAR *source_name; + WCHAR *link_source_name; + WCHAR *type_name; + WCHAR *link_type_name; + LPOLESTR app_name; } ps_struct_t; static const struct ps_flag @@ -120,6 +127,73 @@ static inline WCHAR *strdupAtoW(const ch return ret; } +static inline WCHAR *strdupW(const WCHAR *str) +{ + DWORD len; + WCHAR *ret; + if(!str) return NULL; + len = lstrlenW(str) + 1; + ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + memcpy(ret, str, len * sizeof(WCHAR)); + return ret; +} + +static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct) +{ + FORMATETC fmtetc; + STGMEDIUM stg; + + fmtetc.tymed = TYMED_HGLOBAL; + fmtetc.dwAspect = DVASPECT_CONTENT; + fmtetc.ptd = NULL; + fmtetc.lindex = -1; + + fmtetc.cfFormat = cf_object_descriptor; + if(IDataObject_GetData(ps_struct->ps->lpSrcDataObj, &fmtetc, &stg) == S_OK) + { + OBJECTDESCRIPTOR *obj_desc = GlobalLock(stg.u.hGlobal); + if(obj_desc->dwSrcOfCopy) + ps_struct->source_name = strdupW((WCHAR*)((char*)obj_desc + obj_desc->dwSrcOfCopy)); + if(obj_desc->dwFullUserTypeName) + ps_struct->type_name = strdupW((WCHAR*)((char*)obj_desc + obj_desc->dwFullUserTypeName)); + OleRegGetUserType(&obj_desc->clsid, USERCLASSTYPE_APPNAME, &ps_struct->app_name); + /* Get the icon here. If dwDrawAspect & DVASCPECT_ICON call GetData(CF_METAFILEPICT), otherwise + native calls OleGetIconFromClass(obj_desc->clsid) */ + GlobalUnlock(stg.u.hGlobal); + GlobalFree(stg.u.hGlobal); + } + else + { + /* Try to get some data using some of the other clipboard formats */ + } + + fmtetc.cfFormat = cf_link_src_descriptor; + if(IDataObject_GetData(ps_struct->ps->lpSrcDataObj, &fmtetc, &stg) == S_OK) + { + OBJECTDESCRIPTOR *obj_desc = GlobalLock(stg.u.hGlobal); + if(obj_desc->dwSrcOfCopy) + ps_struct->link_source_name = strdupW((WCHAR*)((char*)obj_desc + obj_desc->dwSrcOfCopy)); + if(obj_desc->dwFullUserTypeName) + ps_struct->link_type_name = strdupW((WCHAR*)((char*)obj_desc + obj_desc->dwFullUserTypeName)); + GlobalUnlock(stg.u.hGlobal); + GlobalFree(stg.u.hGlobal); + } + + if(ps_struct->source_name == NULL && ps_struct->link_source_name == NULL) + { + WCHAR buf[200]; + LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_SRC, buf, sizeof(buf)/sizeof(WCHAR)); + ps_struct->source_name = strdupW(buf); + } + + if(ps_struct->type_name == NULL && ps_struct->link_type_name == NULL) + { + WCHAR buf[200]; + LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_TYPE, buf, sizeof(buf)/sizeof(WCHAR)); + ps_struct->type_name = strdupW(buf); + } +} + static BOOL add_entry_to_lb(HWND hdlg, UINT id, OLEUIPASTEENTRYW *pe) { HWND hwnd = GetDlgItem(hdlg, id); @@ -397,6 +471,11 @@ static void update_structure(HWND hdlg, static void free_structure(ps_struct_t *ps_struct) { + HeapFree(GetProcessHeap(), 0, ps_struct->type_name); + HeapFree(GetProcessHeap(), 0, ps_struct->source_name); + HeapFree(GetProcessHeap(), 0, ps_struct->link_type_name); + HeapFree(GetProcessHeap(), 0, ps_struct->link_source_name); + CoTaskMemFree(ps_struct->app_name); HeapFree(GetProcessHeap(), 0, ps_struct); } @@ -429,6 +508,11 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND { ps_struct = HeapAlloc(GetProcessHeap(), 0, sizeof(*ps_struct)); ps_struct->ps = (OLEUIPASTESPECIALW*)lp; + ps_struct->type_name = NULL; + ps_struct->source_name = NULL; + ps_struct->link_type_name = NULL; + ps_struct->link_source_name = NULL; + ps_struct->app_name = NULL; ps_struct->flags = ps_struct->ps->dwFlags; SetPropW(hdlg, prop_name, ps_struct); @@ -442,6 +526,8 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND if(ps_struct->ps->lpszCaption) SetWindowTextW(hdlg, ps_struct->ps->lpszCaption); + get_descriptors(hdlg, ps_struct); + init_lists(hdlg, ps_struct); selection_change(hdlg, ps_struct);

1 0

Huw Davies : oledlg: Handle paste / link mode change.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 1d9e48c77e575b7f968785f252e7358e981187fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d9e48c77e575b7f968785f25… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 19 11:21:38 2006 +0100 oledlg: Handle paste / link mode change. --- dlls/oledlg/pastespl.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 26f91e8..d0c0e4c 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -362,6 +362,23 @@ static void selection_change(HWND hdlg, update_result_text(hdlg, ps_struct); } +static void mode_change(HWND hdlg, ps_struct_t *ps_struct, UINT id) +{ + if(id == IDC_PS_PASTE) + { + ps_struct->flags &= ~PSF_SELECTPASTELINK; + ps_struct->flags |= PSF_SELECTPASTE; + } + else + { + ps_struct->flags &= ~PSF_SELECTPASTE; + ps_struct->flags |= PSF_SELECTPASTELINK; + } + + update_display_list(hdlg, id == IDC_PS_PASTE ? IDC_PS_PASTELIST : IDC_PS_PASTELINKLIST); + selection_change(hdlg, ps_struct); +} + static void post_help_msg(HWND hdlg, ps_struct_t *ps_struct) { PostMessageW(ps_struct->ps->hWndOwner, oleui_msg_help, (WPARAM)hdlg, IDD_PASTESPECIAL); @@ -437,6 +454,17 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND default: return FALSE; } + case IDC_PS_PASTE: + case IDC_PS_PASTELINK: + switch(HIWORD(wp)) + { + case BN_CLICKED: + mode_change(hdlg, ps_struct, LOWORD(wp)); + return FALSE; + + default: + return FALSE; + } case IDC_OLEUIHELP: switch(HIWORD(wp)) {

1 0

Huw Davies : oledlg: Set initial focus to the display list.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: e898890241b9d617239423d36e22cad3d9e11fc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e898890241b9d617239423d36… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 19 11:24:17 2006 +0100 oledlg: Set initial focus to the display list. --- dlls/oledlg/pastespl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index d0c0e4c..ece44fd 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -440,7 +440,9 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND selection_change(hdlg, ps_struct); - return TRUE; /* use default focus */ + SetFocus(GetDlgItem(hdlg, IDC_PS_DISPLAYLIST)); + + return FALSE; /* use new focus */ } case WM_COMMAND: switch(LOWORD(wp))

1 0