Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[gvg] 19622: Sync to Wine-0_9_2:
by gvg＠svn.reactos.com 26 Nov '05

26 Nov '05

Sync to Wine-0_9_2: Rein Klazes <wijn(a)wanadoo.nl> - Fixes for FormatCharDlgProc16: - properly store the ChooseFont pointer, use a window property as the A and W functions do; - handle other messages then WM_INITDIALOG and WM_MEASUREITEM as well. - In CFn_CHOOSEFONT16to32W fix the conversion of the lpTemplateName and the lpszStyle fields. Francois Gouget <fgouget(a)free.fr> - Remove spaces before '\n' in traces. Dmitry Timoshkov <dmitry(a)codeweavers.com> - There is no need to resize our own fake dialog to match the parent, it doesn't have controls anyway. Markus Amsler <markus.amsler(a)oribi.org> - Improve c2man Documented-Total count. Changes: - add missing description - complete missing A/W pairs - document remaining comdlg32 functions Modified: trunk/reactos/lib/comdlg32/cdlg_Ko.rc Modified: trunk/reactos/lib/comdlg32/filedlg.c Modified: trunk/reactos/lib/comdlg32/fontdlg16.c _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Ko.rc --- trunk/reactos/lib/comdlg32/cdlg_Ko.rc 2005-11-26 10:17:32 UTC (rev 19621) +++ trunk/reactos/lib/comdlg32/cdlg_Ko.rc 2005-11-26 10:18:02 UTC (rev 19622) @@ -1,5 +1,6 @@ /* * Copyright 1996 Bang Jun Young + * Copyright 2005 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -85,7 +86,7 @@ LTEXT "???Ô Ã??·(&Q):", 1092, 6, 100, 76, 9 COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP CHECKBOX "ã??¤À? ???Ô(&L)", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Condensed", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX " ã°?? ????", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -117,76 +118,76 @@ PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 186 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK -CAPTION "Print" +CAPTION "???Ô" FONT 9, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "Cancel", IDCANCEL, 232,164, 48,14, WS_GROUP - PUSHBUTTON "&Help", pshHelp, 50, 161, 48,14, WS_GROUP + DEFPUSHBUTTON "?«??", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON + PUSHBUTTON "?Ù?Ê", IDCANCEL, 232,164, 48,14, WS_GROUP + PUSHBUTTON "ÁÁ??©?(&H)", pshHelp, 50, 161, 48,14, WS_GROUP - GROUPBOX "Printer", grp4, 8, 4, 272,84, WS_GROUP - CONTROL "Print to fi&le", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 - PUSHBUTTON "&Properties", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&Name:", stc6, 16, 20, 36,8 + GROUPBOX "Ã?©???", grp4, 8, 4, 272,84, WS_GROUP + CONTROL "ã??¤À? ???Ô(&l)", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 + PUSHBUTTON "?Ë??(&P)", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "??©º(&N):", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Status:", stc8, 16, 36, 36,10, SS_NOPREFIX - LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Type:", stc7, 16, 48, 36,10, SS_NOPREFIX - LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Where:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Comment:", stc9, 16, 72, 36,10, SS_NOPREFIX - LTEXT "Dummy Remark", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "?¾??:", stc8, 16, 36, 36,10, SS_NOPREFIX + LTEXT "?§?? ?¾??", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "?©?È:", stc7, 16, 48, 36,10, SS_NOPREFIX + LTEXT "?§?? ?©?È", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "¥¯Á?:", stc10, 16, 60, 36,10, SS_NOPREFIX + LTEXT "?§?? ?º?í", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "??©Ý:", stc9, 16, 72, 36,10, SS_NOPREFIX + LTEXT "?§?? ??©Ý", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Copies", grp2, 160, 92, 120,64, WS_GROUP - LTEXT "Number of &copies:",stc5,168,108,68,8 + GROUPBOX "???þ??", grp2, 160, 92, 120,64, WS_GROUP + LTEXT "???þ?? ???÷(&c):",stc5,168,108,68,8 ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE - CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12 + CONTROL "Ãi?í?Ô(&o)", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12 EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Print range", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&All", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "Pa&ges", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "&Selection", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + GROUPBOX "???Ô ?³?º", grp1, 8,92, 144,64, WS_GROUP + CONTROL "©Á?(&A)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 + CONTROL "ãõ???÷(&g)", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 + CONTROL "?????Á?¬(&S)", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 118,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "&from:", stc2, 52,124, 20,8 - RTEXT "&to:", stc3, 100,124, 16,8 + RTEXT "?®?Ô?¡????(&f):", stc2, 52,124, 20,8 + RTEXT "?®?Ô?¯?÷(&t):", stc3, 100,124, 16,8 } PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK -CAPTION "Print Setup" +CAPTION "???Ô ???ñ" FONT 9, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK",IDOK,180,156,48,14,WS_GROUP - PUSHBUTTON "Cancel",IDCANCEL,232,156,48,14 -/* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ + DEFPUSHBUTTON "?«??",IDOK,180,156,48,14,WS_GROUP + PUSHBUTTON "?Ù?Ê",IDCANCEL,232,156,48,14 +/* PUSHBUTTON "?Îã«?÷?®...", psh5, 284,156,48,14 */ - GROUPBOX "Printer", grp4, 8, 4, 272,84, WS_GROUP - PUSHBUTTON "&Properties", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&Name:", stc6, 16, 20, 36,8 + GROUPBOX "Ã?©???", grp4, 8, 4, 272,84, WS_GROUP + PUSHBUTTON "?Ë??(&P)", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "??©º(&N):", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Status:", stc8, 16, 36, 36,10, SS_NOPREFIX - LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Type:", stc7, 16, 48, 36,10, SS_NOPREFIX - LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Where:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Comment:", stc9, 16, 72, 36,10, SS_NOPREFIX - LTEXT "Dummy Remark", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "?¾??:", stc8, 16, 36, 36,10, SS_NOPREFIX + LTEXT "?§?± ?¾??", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "?©?È:", stc7, 16, 48, 36,10, SS_NOPREFIX + LTEXT "?§?? ?©?È", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "¥¯Á?:", stc10, 16, 60, 36,10, SS_NOPREFIX + LTEXT "?§?? ?º?í", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "??©Ý:", stc9, 16, 72, 36,10, SS_NOPREFIX + LTEXT "?§?? ??©Ý", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Paper", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "Si&ze:", stc2, 16,108, 36, 8 + GROUPBOX "?¥??", grp2, 8, 92, 164,56, WS_GROUP + LTEXT "?®?Ô(&z):", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "&Source:", stc3, 16,128, 36, 8 + LTEXT "?°??(&S):", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - GROUPBOX "Orientation", grp1, 180, 92, 100,56, WS_GROUP + GROUPBOX "?µÃÔ", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "P&ortrait", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "L&andscape", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + CONTROL "?íÀ?(&o)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 + CONTROL "??À?(&a)", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 END _____ Modified: trunk/reactos/lib/comdlg32/filedlg.c --- trunk/reactos/lib/comdlg32/filedlg.c 2005-11-26 10:17:32 UTC (rev 19621) +++ trunk/reactos/lib/comdlg32/filedlg.c 2005-11-26 10:18:02 UTC (rev 19622) @@ -283,7 +283,7 @@ } /* Some shell namespace extensions depend on COM being initialized. */ - hr = CoInitialize(NULL); + hr = OleInitialize(NULL); lRes = DialogBoxIndirectParamA(COMDLG32_hInstance, (LPDLGTEMPLATEA) template, @@ -291,7 +291,7 @@ FileOpenDlgProc95, (LPARAM) fodInfos); if (SUCCEEDED(hr)) - CoUninitialize(); + OleUninitialize(); /* Unable to create the dialog */ if( lRes == -1) @@ -701,10 +701,6 @@ /* finally use fixed parent size */ rectParent.bottom -= help_fixup; - /* save the size of the parent's client area */ - rectChild.right = rectParent.right; - rectChild.bottom = rectParent.bottom; - /* set the size of the parent dialog */ AdjustWindowRectEx(&rectParent, GetWindowLongW(hwndParentDlg, GWL_STYLE), FALSE, GetWindowLongW(hwndParentDlg, GWL_EXSTYLE)); @@ -713,10 +709,6 @@ rectParent.right - rectParent.left, rectParent.bottom - rectParent.top, SWP_NOMOVE | SWP_NOZORDER); - - /* set the size of the child dialog */ - SetWindowPos(hwndChildDlg, HWND_BOTTOM, - 0, 0, rectChild.right, rectChild.bottom, SWP_NOACTIVATE); } static INT_PTR CALLBACK FileOpenDlgProcUserTemplate(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -1032,9 +1024,29 @@ FILEDLG95_InitControls(hwnd); if (fodInfos->DlgInfos.hwndCustomDlg) + { + RECT rc; + UINT flags = SWP_NOACTIVATE; + ArrangeCtrlPositions(fodInfos->DlgInfos.hwndCustomDlg, hwnd, (fodInfos->ofnInfos->Flags & (OFN_HIDEREADONLY | OFN_SHOWHELP)) == OFN_HIDEREADONLY); + /* resize the custom dialog to the parent size */ + if (fodInfos->ofnInfos->Flags & (OFN_ENABLETEMPLATE | OFN_ENABLETEMPLATEHANDLE)) + GetClientRect(hwnd, &rc); + else + { + /* our own fake template is zero sized and doesn't have + * children, so there is no need to resize it. + * Picasa depends on it. + */ + flags |= SWP_NOSIZE; + SetRectEmpty(&rc); + } + SetWindowPos(fodInfos->DlgInfos.hwndCustomDlg, HWND_BOTTOM, + 0, 0, rc.right, rc.bottom, flags); + } + FILEDLG95_FillControls(hwnd, wParam, lParam); SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE); @@ -3782,6 +3794,8 @@ { BOOL win16look = FALSE; + TRACE("flags %08lx\n", ofn->Flags); + /* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */ if (ofn->Flags & OFN_FILEMUSTEXIST) ofn->Flags |= OFN_PATHMUSTEXIST; @@ -3810,6 +3824,12 @@ { BOOL win16look = FALSE; + TRACE("flags %08lx\n", ofn->Flags); + + /* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */ + if (ofn->Flags & OFN_FILEMUSTEXIST) + ofn->Flags |= OFN_PATHMUSTEXIST; + if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) win16look = (ofn->Flags & OFN_EXPLORER) ? FALSE : TRUE; _____ Modified: trunk/reactos/lib/comdlg32/fontdlg16.c --- trunk/reactos/lib/comdlg32/fontdlg16.c 2005-11-26 10:17:32 UTC (rev 19621) +++ trunk/reactos/lib/comdlg32/fontdlg16.c 2005-11-26 10:18:02 UTC (rev 19622) @@ -41,6 +41,9 @@ #include "cdlg.h" #include "cdlg16.h" +static const WCHAR strWineFontData16[] = + {'_','_','W','I','N','E','_','F','O','N','T','D','L','G','D','A','T','A' ,'1','6',0}; + static void FONT_LogFont16To32W( const LPLOGFONT16 font16, LPLOGFONTW font32 ) { font32->lfHeight = font16->lfHeight; @@ -58,7 +61,7 @@ font32->lfPitchAndFamily = font16->lfPitchAndFamily; MultiByteToWideChar(CP_ACP, 0, font16->lfFaceName, LF_FACESIZE, font32->lfFaceName, LF_FACESIZE); -}; +} static void FONT_Metrics16To32W( const TEXTMETRIC16 *pm16, NEWTEXTMETRICEXW *pnm32w) @@ -67,24 +70,23 @@ /* NOTE: only the fields used by AddFontStyle() are filled in */ pnm32w->ntmTm.tmHeight = pm16->tmHeight; pnm32w->ntmTm.tmExternalLeading = pm16->tmExternalLeading; -}; +} static void CFn_CHOOSEFONT16to32W(LPCHOOSEFONT16 chf16, LPCHOOSEFONTW chf32w) { int len; - if(chf16->lpTemplateName) + if (chf16->Flags & CF_ENABLETEMPLATE) { - len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)chf16->lpTemplateName, -1, NULL, 0); - chf32w->lpTemplateName = HeapAlloc(GetProcessHeap(), 0,len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, (LPSTR)MapSL(chf16->lpTemplateName), - -1, (LPWSTR)chf32w->lpTemplateName, len); + len = MultiByteToWideChar( CP_ACP, 0, MapSL(chf16->lpTemplateName), -1, NULL, 0); + chf32w->lpTemplateName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar( CP_ACP, 0, MapSL(chf16->lpTemplateName), + -1, (LPWSTR)chf32w->lpTemplateName, len); } - if(chf16->lpszStyle) + if (chf16->Flags & CF_USESTYLE) { - len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)chf16->lpszStyle, -1, NULL, 0); - chf32w->lpszStyle = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, (LPSTR)MapSL(chf16->lpTemplateName), - -1, chf32w->lpszStyle, len); + len = MultiByteToWideChar( CP_ACP, 0, MapSL(chf16->lpszStyle), -1, NULL, 0); + chf32w->lpszStyle = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar( CP_ACP, 0, MapSL(chf16->lpszStyle), -1, chf32w->lpszStyle, len); } chf32w->lStructSize=sizeof(CHOOSEFONTW); chf32w->hwndOwner=HWND_32(chf16->hwndOwner); @@ -95,12 +97,11 @@ chf32w->lCustData=chf16->lCustData; chf32w->lpfnHook=NULL; chf32w->hInstance=HINSTANCE_32(chf16->hInstance); - chf32w->lpszStyle=MapSL(chf16->lpszStyle); chf32w->nFontType=chf16->nFontType; chf32w->nSizeMax=chf16->nSizeMax; chf32w->nSizeMin=chf16->nSizeMin; FONT_LogFont16To32W(MapSL(chf16->lpLogFont), chf32w->lpLogFont); -}; +} /*********************************************************************** * CFn_HookCallChk [internal] @@ -122,11 +123,13 @@ { HWND hwnd=HWND_32(LOWORD(lParam)); HWND hDlg=GetParent(hwnd); - LPCHOOSEFONT16 lpcf=(LPCHOOSEFONT16)GetWindowLongPtrW(hDlg, DWLP_USER); + LPCHOOSEFONT16 lpcf; LOGFONT16 *lplf = MapSL( logfont ); TEXTMETRIC16 *lpmtrx16 = MapSL(metrics); ENUMLOGFONTEXW elf32w; NEWTEXTMETRICEXW nmtrx32w; + + lpcf = (LPCHOOSEFONT16)GetPropW(hDlg, strWineFontData16); FONT_LogFont16To32W(lplf, &(elf32w.elfLogFont)); FONT_Metrics16To32W(lpmtrx16, &nmtrx32w); return AddFontFamily(&elf32w, &nmtrx32w, nFontType, @@ -142,11 +145,13 @@ HWND hcmb2=HWND_32(LOWORD(lParam)); HWND hcmb3=HWND_32(HIWORD(lParam)); HWND hDlg=GetParent(hcmb3); - LPCHOOSEFONT16 lpcf=(LPCHOOSEFONT16)GetWindowLongPtrW(hDlg, DWLP_USER); + LPCHOOSEFONT16 lpcf; LOGFONT16 *lplf = MapSL(logfont); TEXTMETRIC16 *lpmtrx16 = MapSL(metrics); ENUMLOGFONTEXW elf32w; NEWTEXTMETRICEXW nmtrx32w; + + lpcf = (LPCHOOSEFONT16)GetPropW(hDlg, strWineFontData16); FONT_LogFont16To32W(lplf, &(elf32w.elfLogFont)); FONT_Metrics16To32W(lpmtrx16, &nmtrx32w); return AddFontStyle(&elf32w, &nmtrx32w, nFontType, @@ -300,13 +305,13 @@ BOOL16 res=0; if (message!=WM_INITDIALOG) { - lpcf=(LPCHOOSEFONT16)GetWindowLongPtrW(hDlg, DWLP_USER); - if (!lpcf && message != WM_MEASUREITEM) - return FALSE; - if (CFn_HookCallChk(lpcf)) - res=CallWindowProc16((WNDPROC16)lpcf->lpfnHook,hDlg16,message,wParam,lPa ram); - if (res) - return res; + lpcf = (LPCHOOSEFONT16)GetPropW(hDlg, strWineFontData16); + if (!lpcf) + return FALSE; + if (CFn_HookCallChk(lpcf)) + res=CallWindowProc16((WNDPROC16)lpcf->lpfnHook,hDlg16,message,wParam,lPa ram); + if (res) + return res; } else { @@ -316,6 +321,7 @@ TRACE("CFn_WMInitDialog returned FALSE\n"); return FALSE; } + SetPropW(hDlg, strWineFontData16, (HANDLE)lParam); if (CFn_HookCallChk(lpcf)) return CallWindowProc16((WNDPROC16)lpcf->lpfnHook,hDlg16,WM_INITDIALOG,wParam,l Param); }

1 0

[weiden] 19621: implemented SetupDiGetDeviceInstanceIdA
by weiden＠svn.reactos.com 26 Nov '05

26 Nov '05

implemented SetupDiGetDeviceInstanceIdA Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-11-26 09:50:28 UTC (rev 19620) +++ trunk/reactos/lib/setupapi/devinst.c 2005-11-26 10:17:32 UTC (rev 19621) @@ -3472,10 +3472,40 @@ IN DWORD DeviceInstanceIdSize, OUT PDWORD RequiredSize) { - FIXME ("Stub %p %p %p %d %p\n", - DeviceInfoSet, DeviceInfoData, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + PWSTR DeviceInstanceIdW = NULL; + BOOL ret = FALSE; + + TRACE("%p %p %p %lu %p\n", DeviceInfoSet, DeviceInfoData, + DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); + + if (!DeviceInstanceId && DeviceInstanceIdSize > 0) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + if (DeviceInstanceIdSize != 0) + { + DeviceInstanceIdW = MyMalloc(DeviceInstanceIdSize * sizeof(WCHAR)); + if (DeviceInstanceIdW == NULL) + return FALSE; + } + + ret = SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, + DeviceInstanceIdW, DeviceInstanceIdSize, + RequiredSize); + + if (DeviceInstanceIdW != NULL) + { + if (WideCharToMultiByte(CP_ACP, 0, DeviceInstanceIdW, -1, + DeviceInstanceId, DeviceInstanceIdSize, NULL, NULL) == 0) + { + DeviceInstanceId[0] = '\0'; + ret = FALSE; + } + } + } + + TRACE("Returning 0x%p\n", ret); + return ret; } /***********************************************************************

1 0

[gvg] 19619: Tag Wine-0_9_2
by gvg＠svn.reactos.com 26 Nov '05

26 Nov '05

Tag Wine-0_9_2 Deleted: vendor/wine/dlls/avifil32/Wine-0_9_1/ Added: vendor/wine/dlls/avifil32/Wine-0_9_2/ Added: vendor/wine/dlls/avifil32/Wine-0_9_2/avifile_Ko.rc Deleted: vendor/wine/dlls/avifil32/Wine-0_9_2/rsrc.rc Added: vendor/wine/dlls/avifil32/Wine-0_9_2/rsrc.rc Deleted: vendor/wine/dlls/cabinet/Wine-0_9_1/ Added: vendor/wine/dlls/cabinet/Wine-0_9_2/ Deleted: vendor/wine/dlls/comctl32/Wine-0_9_1/ Added: vendor/wine/dlls/comctl32/Wine-0_9_2/ Deleted: vendor/wine/dlls/comctl32/Wine-0_9_2/comctl_Ko.rc Added: vendor/wine/dlls/comctl32/Wine-0_9_2/comctl_Ko.rc Deleted: vendor/wine/dlls/comctl32/Wine-0_9_2/header.c Added: vendor/wine/dlls/comctl32/Wine-0_9_2/header.c Deleted: vendor/wine/dlls/comctl32/Wine-0_9_2/rebar.c Added: vendor/wine/dlls/comctl32/Wine-0_9_2/rebar.c Deleted: vendor/wine/dlls/comctl32/Wine-0_9_2/syslink.c Added: vendor/wine/dlls/comctl32/Wine-0_9_2/syslink.c Deleted: vendor/wine/dlls/comctl32/Wine-0_9_2/tooltips.c Added: vendor/wine/dlls/comctl32/Wine-0_9_2/tooltips.c Deleted: vendor/wine/dlls/commdlg/Wine-0_9_1/ Added: vendor/wine/dlls/commdlg/Wine-0_9_2/ Deleted: vendor/wine/dlls/commdlg/Wine-0_9_2/cdlg_Ko.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_2/cdlg_Ko.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_2/filedlg.c Added: vendor/wine/dlls/commdlg/Wine-0_9_2/filedlg.c Deleted: vendor/wine/dlls/commdlg/Wine-0_9_2/fontdlg16.c Added: vendor/wine/dlls/commdlg/Wine-0_9_2/fontdlg16.c Deleted: vendor/wine/dlls/crypt32/Wine-0_9_1/ Added: vendor/wine/dlls/crypt32/Wine-0_9_2/ Deleted: vendor/wine/dlls/crypt32/Wine-0_9_2/cert.c Added: vendor/wine/dlls/crypt32/Wine-0_9_2/cert.c Deleted: vendor/wine/dlls/crypt32/Wine-0_9_2/encode.c Added: vendor/wine/dlls/crypt32/Wine-0_9_2/encode.c Deleted: vendor/wine/dlls/dinput/Wine-0_9_1/ Added: vendor/wine/dlls/dinput/Wine-0_9_2/ Deleted: vendor/wine/dlls/dinput/Wine-0_9_2/dinput_main.c Added: vendor/wine/dlls/dinput/Wine-0_9_2/dinput_main.c Deleted: vendor/wine/dlls/dinput/Wine-0_9_2/effect_linuxinput.c Added: vendor/wine/dlls/dinput/Wine-0_9_2/effect_linuxinput.c Deleted: vendor/wine/dlls/dinput/Wine-0_9_2/joystick_linuxinput.c Added: vendor/wine/dlls/dinput/Wine-0_9_2/joystick_linuxinput.c Deleted: vendor/wine/dlls/dinput8/Wine-0_9_1/ Added: vendor/wine/dlls/dinput8/Wine-0_9_2/ Deleted: vendor/wine/dlls/dplay/Wine-0_9_1/ Added: vendor/wine/dlls/dplay/Wine-0_9_2/ Deleted: vendor/wine/dlls/dplayx/Wine-0_9_1/ Added: vendor/wine/dlls/dplayx/Wine-0_9_2/ Deleted: vendor/wine/dlls/dplayx/Wine-0_9_2/dplay.c Added: vendor/wine/dlls/dplayx/Wine-0_9_2/dplay.c Deleted: vendor/wine/dlls/dsound/Wine-0_9_1/ Added: vendor/wine/dlls/dsound/Wine-0_9_2/ Deleted: vendor/wine/dlls/icmp/Wine-0_9_1/ Added: vendor/wine/dlls/icmp/Wine-0_9_2/ Deleted: vendor/wine/dlls/midimap/Wine-0_9_1/ Added: vendor/wine/dlls/midimap/Wine-0_9_2/ Deleted: vendor/wine/dlls/mpr/Wine-0_9_1/ Added: vendor/wine/dlls/mpr/Wine-0_9_2/ Deleted: vendor/wine/dlls/msi/Wine-0_9_1/ Added: vendor/wine/dlls/msi/Wine-0_9_2/ Deleted: vendor/wine/dlls/msi/Wine-0_9_2/helpers.c Added: vendor/wine/dlls/msi/Wine-0_9_2/helpers.c Deleted: vendor/wine/dlls/msi/Wine-0_9_2/msi_Ko.rc Added: vendor/wine/dlls/msi/Wine-0_9_2/msi_Ko.rc Deleted: vendor/wine/dlls/msi/Wine-0_9_2/registry.c Added: vendor/wine/dlls/msi/Wine-0_9_2/registry.c Deleted: vendor/wine/dlls/msimg32/Wine-0_9_1/ Added: vendor/wine/dlls/msimg32/Wine-0_9_2/ Deleted: vendor/wine/dlls/netapi32/Wine-0_9_1/ Added: vendor/wine/dlls/netapi32/Wine-0_9_2/ Deleted: vendor/wine/dlls/netapi32/Wine-0_9_2/access.c Added: vendor/wine/dlls/netapi32/Wine-0_9_2/access.c Deleted: vendor/wine/dlls/netapi32/Wine-0_9_2/netapi32.c Added: vendor/wine/dlls/netapi32/Wine-0_9_2/netapi32.c Deleted: vendor/wine/dlls/objsel/Wine-0_9_1/ Added: vendor/wine/dlls/objsel/Wine-0_9_2/ Deleted: vendor/wine/dlls/ole32/Wine-0_9_1/ Added: vendor/wine/dlls/ole32/Wine-0_9_2/ Deleted: vendor/wine/dlls/oleaut32/Wine-0_9_1/ Added: vendor/wine/dlls/oleaut32/Wine-0_9_2/ Deleted: vendor/wine/dlls/oledlg/Wine-0_9_1/ Added: vendor/wine/dlls/oledlg/Wine-0_9_2/ Deleted: vendor/wine/dlls/oledlg/Wine-0_9_2/oledlg_Ko.rc Added: vendor/wine/dlls/oledlg/Wine-0_9_2/oledlg_Ko.rc Deleted: vendor/wine/dlls/olepro32/Wine-0_9_1/ Added: vendor/wine/dlls/olepro32/Wine-0_9_2/ Deleted: vendor/wine/dlls/riched20/Wine-0_9_1/ Added: vendor/wine/dlls/riched20/Wine-0_9_2/ Deleted: vendor/wine/dlls/richedit/Wine-0_9_1/ Added: vendor/wine/dlls/richedit/Wine-0_9_2/ Deleted: vendor/wine/dlls/rpcrt4/Wine-0_9_1/ Added: vendor/wine/dlls/rpcrt4/Wine-0_9_2/ Deleted: vendor/wine/dlls/rpcrt4/Wine-0_9_2/rpcrt4.spec Added: vendor/wine/dlls/rpcrt4/Wine-0_9_2/rpcrt4.spec Deleted: vendor/wine/dlls/shdocvw/Wine-0_9_1/ Added: vendor/wine/dlls/shdocvw/Wine-0_9_2/ Deleted: vendor/wine/dlls/shdocvw/Wine-0_9_2/Ko.rc Added: vendor/wine/dlls/shdocvw/Wine-0_9_2/Ko.rc Deleted: vendor/wine/dlls/shdocvw/Wine-0_9_2/Makefile.in Added: vendor/wine/dlls/shdocvw/Wine-0_9_2/Makefile.in Deleted: vendor/wine/dlls/shdocvw/Wine-0_9_2/client.c [truncated at 100 lines; 178 more skipped] _____ Copied: vendor/wine/dlls/avifil32/Wine-0_9_2 (from rev 19573, vendor/wine/dlls/avifil32/current) _____ Copied: vendor/wine/dlls/avifil32/Wine-0_9_2/avifile_Ko.rc (from rev 19575, vendor/wine/dlls/avifil32/current/avifile_Ko.rc) _____ Deleted: vendor/wine/dlls/avifil32/Wine-0_9_2/rsrc.rc --- vendor/wine/dlls/avifil32/current/rsrc.rc 2005-11-25 21:38:37 UTC (rev 19573) +++ vendor/wine/dlls/avifil32/Wine-0_9_2/rsrc.rc 2005-11-26 09:49:14 UTC (rev 19619) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael G³nnewig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winver.h" -#include "avifile_private.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#define WINE_OLESELFREGISTER -#define WINE_FILEDESCRIPTION_STR "Wine AVI file support library" -#define WINE_FILENAME_STR "avifil32.dll" -#define WINE_FILEVERSION 4,0,3,1998 -#define WINE_FILEVERSION_STR "4.03.1998" - -#include "wine/wine_common_ver.rc" - -/* - * Everything specific to any language goes - * in one of the specific files. - */ -#include "avifile_Cs.rc" -#include "avifile_De.rc" -#include "avifile_En.rc" -#include "avifile_Es.rc" -#include "avifile_Fr.rc" -#include "avifile_It.rc" -#include "avifile_Ja.rc" -#include "avifile_Nl.rc" -#include "avifile_No.rc" -#include "avifile_Pl.rc" -#include "avifile_Pt.rc" -#include "avifile_Ru.rc" -#include "avifile_Si.rc" _____ Copied: vendor/wine/dlls/avifil32/Wine-0_9_2/rsrc.rc (from rev 19575, vendor/wine/dlls/avifil32/current/rsrc.rc) _____ Copied: vendor/wine/dlls/cabinet/Wine-0_9_2 (from rev 19573, vendor/wine/dlls/cabinet/current) _____ Copied: vendor/wine/dlls/comctl32/Wine-0_9_2 (from rev 19573, vendor/wine/dlls/comctl32/current) _____ Deleted: vendor/wine/dlls/comctl32/Wine-0_9_2/comctl_Ko.rc --- vendor/wine/dlls/comctl32/current/comctl_Ko.rc 2005-11-25 21:38:37 UTC (rev 19573) +++ vendor/wine/dlls/comctl32/Wine-0_9_2/comctl_Ko.rc 2005-11-26 09:49:14 UTC (rev 19619) @@ -1,82 +0,0 @@ -/* - * Copyright 2002 Won-kyu Park <wkpark(a)kldp.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Properties for " -FONT 9, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "?«??", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "?Ù?Ê", IDCANCEL,58,122,50,14 - PUSHBUTTON "?¹?Ù(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "ÁÁ??©?", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS _MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Wizard" -FONT 9, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< ???³(&B)", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "???¢(&N) >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "?¥Àß", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "?Ù?Ê", IDCANCEL,178,138,50,14 - PUSHBUTTON "ÁÁ??©?", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Customize Toolbar" -FONT 9, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "?¦?Ô(&C)", IDCANCEL,308,6,44,14 - PUSHBUTTON "??¢?(&e)", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "ÁÁ??©?(&H)", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "Move &Up", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "Move &Down", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "A&vailable buttons:", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "&Add ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- &Remove", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Toolbar buttons:", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "?¦?Ô" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "????:" - IDM_GOTODAY "Go to today" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "Separator" -} _____ Copied: vendor/wine/dlls/comctl32/Wine-0_9_2/comctl_Ko.rc (from rev 19575, vendor/wine/dlls/comctl32/current/comctl_Ko.rc) _____ Deleted: vendor/wine/dlls/comctl32/Wine-0_9_2/header.c --- vendor/wine/dlls/comctl32/current/header.c 2005-11-25 21:38:37 UTC (rev 19573) +++ vendor/wine/dlls/comctl32/Wine-0_9_2/header.c 2005-11-26 09:49:14 UTC (rev 19619) @@ -1,1885 +0,0 @@ -/* - * Header control - * - * Copyright 1998 Eric Kohl - * Copyright 2000 Eric Kohl for CodeWeavers - * Copyright 2003 Maxime Bellenge - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * TODO: - * - Imagelist support (partially). - * - Callback items (under construction). - * - Hottrack support (partially). - * - Custom draw support (including Notifications). - * - Drag and Drop support (including Notifications). - * - New messages. - * - Use notification format - * - Correct the order maintenance code to preserve valid order - * - */ - -#include <stdarg.h> -#include <string.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/unicode.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" -#include "comctl32.h" -#include "imagelist.h" -#include "tmschema.h" -#include "uxtheme.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(header); - -typedef struct -{ - INT cxy; - HBITMAP hbm; - LPWSTR pszText; - INT fmt; - LPARAM lParam; - INT iImage; - INT iOrder; /* see documentation of HD_ITEM */ - - BOOL bDown; /* is item pressed? (used for drawing) */ - RECT rect; /* bounding rectangle of the item */ -} HEADER_ITEM; - - -typedef struct -{ - HWND hwndNotify; /* Owner window to send notifications to */ - INT nNotifyFormat; /* format used for WM_NOTIFY messages */ - UINT uNumItem; /* number of items (columns) */ - INT nHeight; /* height of the header (pixels) */ - HFONT hFont; /* handle to the current font */ - HCURSOR hcurArrow; /* handle to the arrow cursor */ - HCURSOR hcurDivider; /* handle to a cursor (used over dividers) <-|-> */ - HCURSOR hcurDivopen; /* handle to a cursor (used over dividers) <-||-> */ - BOOL bCaptured; /* Is the mouse captured? */ - BOOL bPressed; /* Is a header item pressed (down)? */ - BOOL bTracking; /* Is in tracking mode? */ - BOOL bUnicode; /* Unicode flag */ - INT iMoveItem; /* index of tracked item. (Tracking mode) */ - INT xTrackOffset; /* distance between the right side of the tracked item and the cursor */ - INT xOldTrack; /* track offset (see above) after the last WM_MOUSEMOVE */ - INT nOldWidth; /* width of a sizing item after the last WM_MOUSEMOVE */ - INT iHotItem; /* index of hot item (cursor is over this item) */ - INT iMargin; /* width of the margin that surrounds a bitmap */ - - HIMAGELIST himl; /* handle to an image list (may be 0) */ - HEADER_ITEM *items; /* pointer to array of HEADER_ITEM's */ - INT *order; /* array of item IDs indexed by order */ - BOOL bRectsValid; /* validity flag for bounding rectangles */ -} HEADER_INFO; - - -#define VERT_BORDER 3 -#define DIVIDER_WIDTH 10 - -#define HEADER_GetInfoPtr(hwnd) ((HEADER_INFO *)GetWindowLongPtrW(hwnd,0)) - -static const WCHAR themeClass[] = {'H','e','a','d','e','r',0}; - - -inline static LRESULT -HEADER_IndexToOrder (HWND hwnd, INT iItem) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HEADER_ITEM *lpItem = &infoPtr->items[iItem]; - return lpItem->iOrder; -} - - -static INT -HEADER_OrderToIndex(HWND hwnd, WPARAM wParam) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - INT iorder = (INT)wParam; - - if ((iorder <0) || iorder >= infoPtr->uNumItem) - return iorder; - return infoPtr->order[iorder]; -} - -static void -HEADER_SetItemBounds (HWND hwnd) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HEADER_ITEM *phdi; - RECT rect; - unsigned int i; - int x; - - infoPtr->bRectsValid = TRUE; - - if (infoPtr->uNumItem == 0) - return; - - GetClientRect (hwnd, &rect); - - x = rect.left; - for (i = 0; i < infoPtr->uNumItem; i++) { - phdi = &infoPtr->items[HEADER_OrderToIndex(hwnd,i)]; - phdi->rect.top = rect.top; - phdi->rect.bottom = rect.bottom; - phdi->rect.left = x; - phdi->rect.right = phdi->rect.left + ((phdi->cxy>0)?phdi->cxy:0); - x = phdi->rect.right; - } -} - -static LRESULT -HEADER_Size (HWND hwnd, WPARAM wParam) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - - infoPtr->bRectsValid = FALSE; - - return 0; -} - - -static INT -HEADER_DrawItem (HWND hwnd, HDC hdc, INT iItem, BOOL bHotTrack) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HEADER_ITEM *phdi = &infoPtr->items[iItem]; - RECT r; - INT oldBkMode, cxEdge = GetSystemMetrics(SM_CXEDGE); - HTHEME theme = GetWindowTheme (hwnd); - - TRACE("DrawItem(iItem %d bHotTrack %d unicode flag %d)\n", iItem, bHotTrack, infoPtr->bUnicode); - - if (!infoPtr->bRectsValid) - HEADER_SetItemBounds(hwnd); - - r = phdi->rect; - if (r.right - r.left == 0) - return phdi->rect.right; - - if (theme != NULL) { - int state = (phdi->bDown) ? HIS_PRESSED : - (bHotTrack ? HIS_HOT : HIS_NORMAL); - DrawThemeBackground (theme, hdc, HP_HEADERITEM, state, - &r, NULL); - GetThemeBackgroundContentRect (theme, hdc, HP_HEADERITEM, state, - &r, &r); - } - else { - if (GetWindowLongW (hwnd, GWL_STYLE) & HDS_BUTTONS) { - if (phdi->bDown) { - DrawEdge (hdc, &r, BDR_RAISEDOUTER, - BF_RECT | BF_FLAT | BF_MIDDLE | BF_ADJUST); - } - else - DrawEdge (hdc, &r, EDGE_RAISED, - BF_RECT | BF_SOFT | BF_MIDDLE | BF_ADJUST); - } - else - DrawEdge (hdc, &r, EDGE_ETCHED, BF_BOTTOM | BF_RIGHT | BF_ADJUST); - } - if (phdi->bDown) { - r.left += 2; - r.top += 2; - } - - r.left -= cxEdge; - r.right += cxEdge; - - if (phdi->fmt & HDF_OWNERDRAW) { - DRAWITEMSTRUCT dis; - NMCUSTOMDRAW nmcd; - - nmcd.hdr.hwndFrom = hwnd; - nmcd.hdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); - nmcd.hdr.code = NM_CUSTOMDRAW; - nmcd.dwDrawStage = CDDS_PREPAINT | CDDS_ITEM | CDDS_ITEMPOSTERASE; - nmcd.hdc = hdc; - nmcd.dwItemSpec = iItem; - nmcd.rc = r; - nmcd.uItemState = phdi->bDown ? CDIS_SELECTED : 0; - nmcd.lItemlParam = phdi->lParam; - - SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmcd.hdr.idFrom, (LPARAM)&nmcd); - - dis.CtlType = ODT_HEADER; - dis.CtlID = GetWindowLongPtrW (hwnd, GWLP_ID); - dis.itemID = iItem; - dis.itemAction = ODA_DRAWENTIRE; - dis.itemState = phdi->bDown ? ODS_SELECTED : 0; - dis.hwndItem = hwnd; - dis.hDC = hdc; - dis.rcItem = r; - dis.itemData = phdi->lParam; - oldBkMode = SetBkMode(hdc, TRANSPARENT); - SendMessageW (infoPtr->hwndNotify, WM_DRAWITEM, - (WPARAM)dis.CtlID, (LPARAM)&dis); - if (oldBkMode != TRANSPARENT) - SetBkMode(hdc, oldBkMode); - } - else { - UINT rw, rh, /* width and height of r */ - *x = NULL, *w = NULL; /* x and width of the pic (bmp or img) which is part of cnt */ - /* cnt,txt,img,bmp */ - UINT cx, tx, ix, bx, - cw, tw, iw, bw; - BITMAP bmp; - - cw = tw = iw = bw = 0; - rw = r.right - r.left; - rh = r.bottom - r.top; - - if (phdi->fmt & HDF_STRING) { - RECT textRect; - - DrawTextW (hdc, phdi->pszText, -1, - &textRect, DT_LEFT|DT_VCENTER|DT_SINGLELINE|DT_CALCRECT); - cw = textRect.right - textRect.left + 2 * infoPtr->iMargin; - } - - if ((phdi->fmt & HDF_IMAGE) && (infoPtr->himl)) { - iw = infoPtr->himl->cx + 2 * infoPtr->iMargin; - x = &ix; - w = &iw; - } - - if ((phdi->fmt & HDF_BITMAP) && (phdi->hbm)) { - GetObjectW (phdi->hbm, sizeof(BITMAP), (LPVOID)&bmp); - bw = bmp.bmWidth + 2 * infoPtr->iMargin; - if (!iw) { - x = &bx; - w = &bw; - } - } - - if (bw || iw) - cw += *w; - - /* align cx using the unclipped cw */ - if ((phdi->fmt & HDF_JUSTIFYMASK) == HDF_LEFT) - cx = r.left; - else if ((phdi->fmt & HDF_JUSTIFYMASK) == HDF_CENTER) - cx = r.left + rw / 2 - cw / 2; - else /* HDF_RIGHT */ - cx = r.right - cw; - - /* clip cx & cw */ - if (cx < r.left) - cx = r.left; - if (cx + cw > r.right) - cw = r.right - cx; - - tx = cx + infoPtr->iMargin; - /* since cw might have changed we have to recalculate tw */ - tw = cw - infoPtr->iMargin * 2; - - if (iw || bw) { - tw -= *w; - if (phdi->fmt & HDF_BITMAP_ON_RIGHT) { - /* put pic behind text */ - *x = cx + tw + infoPtr->iMargin * 3; - } else { - *x = cx + infoPtr->iMargin; - /* move text behind pic */ - tx += *w; - } - } - - if (iw && bw) { - /* since we're done with the layout we can - now calculate the position of bmp which - has no influence on alignment and layout - because of img */ - if ((phdi->fmt & HDF_JUSTIFYMASK) == HDF_RIGHT) - bx = cx - bw + infoPtr->iMargin; - else - bx = cx + cw + infoPtr->iMargin; - } - - if (iw || bw) { - HDC hClipDC = GetDC(hwnd); - HRGN hClipRgn = CreateRectRgn(r.left, r.top, r.right, r.bottom); - SelectClipRgn(hClipDC, hClipRgn); - - if (bw) { - HDC hdcBitmap = CreateCompatibleDC (hClipDC); - SelectObject (hdcBitmap, phdi->hbm); - BitBlt (hClipDC, bx, r.top + ((INT)rh - bmp.bmHeight) / 2, - bmp.bmWidth, bmp.bmHeight, hdcBitmap, 0, 0, SRCCOPY); - DeleteDC (hdcBitmap); - } - - if (iw) { - ImageList_DrawEx (infoPtr->himl, phdi->iImage, hClipDC, - ix, r.top + ((INT)rh - infoPtr->himl->cy) / 2, - infoPtr->himl->cx, infoPtr->himl->cy, CLR_DEFAULT, CLR_DEFAULT, 0); - } - - DeleteObject(hClipRgn); - ReleaseDC(hwnd, hClipDC); - } - - if (((phdi->fmt & HDF_STRING) - || (!(phdi->fmt & (HDF_OWNERDRAW|HDF_STRING|HDF_BITMAP| - HDF_BITMAP_ON_RIGHT|HDF_IMAGE)))) /* no explicit format specified? */ - && (phdi->pszText)) { - oldBkMode = SetBkMode(hdc, TRANSPARENT); - SetTextColor (hdc, (bHotTrack && !theme) ? COLOR_HIGHLIGHT : COLOR_BTNTEXT); - r.left = tx; - r.right = tx + tw; - DrawTextW (hdc, phdi->pszText, -1, - &r, DT_LEFT|DT_END_ELLIPSIS|DT_VCENTER|DT_SINGLELINE); - if (oldBkMode != TRANSPARENT) - SetBkMode(hdc, oldBkMode); - } - }/*Ownerdrawn*/ - - return phdi->rect.right; -} - - -static void -HEADER_Refresh (HWND hwnd, HDC hdc) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HFONT hFont, hOldFont; - RECT rect; - HBRUSH hbrBk; - UINT i; - INT x; - HTHEME theme = GetWindowTheme (hwnd); - - /* get rect for the bar, adjusted for the border */ - GetClientRect (hwnd, &rect); - - hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT); - hOldFont = SelectObject (hdc, hFont); - - /* draw Background */ - if (theme == NULL) { - hbrBk = GetSysColorBrush(COLOR_3DFACE); - FillRect(hdc, &rect, hbrBk); - } - - x = rect.left; - for (i = 0; x <= rect.right && i < infoPtr->uNumItem; i++) { - x = HEADER_DrawItem (hwnd, hdc, HEADER_OrderToIndex(hwnd,i), - infoPtr->iHotItem == i); - } - - if ((x <= rect.right) && (infoPtr->uNumItem > 0)) { - rect.left = x; - if (theme != NULL) { - DrawThemeBackground (theme, hdc, HP_HEADERITEM, HIS_NORMAL, &rect, - NULL); - } - else { - if (GetWindowLongW (hwnd, GWL_STYLE) & HDS_BUTTONS) - DrawEdge (hdc, &rect, EDGE_RAISED, BF_TOP|BF_LEFT|BF_BOTTOM|BF_SOFT); - else - DrawEdge (hdc, &rect, EDGE_ETCHED, BF_BOTTOM); - } - } - - SelectObject (hdc, hOldFont); -} - - -static void -HEADER_RefreshItem (HWND hwnd, HDC hdc, INT iItem) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HFONT hFont, hOldFont; - - hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT); - hOldFont = SelectObject (hdc, hFont); - HEADER_DrawItem (hwnd, hdc, iItem, infoPtr->iHotItem == iItem); - SelectObject (hdc, hOldFont); -} - - -static void -HEADER_InternalHitTest (HWND hwnd, LPPOINT lpPt, UINT *pFlags, INT *pItem) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - RECT rect, rcTest; - UINT iCount; - INT width; - BOOL bNoWidth; - - GetClientRect (hwnd, &rect); - - *pFlags = 0; - bNoWidth = FALSE; - if (PtInRect (&rect, *lpPt)) - { - if (infoPtr->uNumItem == 0) { - *pFlags |= HHT_NOWHERE; - *pItem = 1; - TRACE("NOWHERE\n"); - return; - } - else { - /* somewhere inside */ - for (iCount = 0; iCount < infoPtr->uNumItem; iCount++) { - rect = infoPtr->items[iCount].rect; - width = rect.right - rect.left; - if (width == 0) { - bNoWidth = TRUE; - continue; - } - if (PtInRect (&rect, *lpPt)) { - if (width <= 2 * DIVIDER_WIDTH) { - *pFlags |= HHT_ONHEADER; - *pItem = iCount; - TRACE("ON HEADER %d\n", iCount); - return; - } - if (iCount > 0) { - rcTest = rect; - rcTest.right = rcTest.left + DIVIDER_WIDTH; - if (PtInRect (&rcTest, *lpPt)) { - if (bNoWidth) { - *pFlags |= HHT_ONDIVOPEN; - *pItem = iCount - 1; - TRACE("ON DIVOPEN %d\n", *pItem); - return; - } - else { - *pFlags |= HHT_ONDIVIDER; - *pItem = iCount - 1; - TRACE("ON DIVIDER %d\n", *pItem); - return; - } - } - } - rcTest = rect; - rcTest.left = rcTest.right - DIVIDER_WIDTH; - if (PtInRect (&rcTest, *lpPt)) { - *pFlags |= HHT_ONDIVIDER; - *pItem = iCount; - TRACE("ON DIVIDER %d\n", *pItem); - return; - } - - *pFlags |= HHT_ONHEADER; - *pItem = iCount; - TRACE("ON HEADER %d\n", iCount); - return; - } - } - - /* check for last divider part (on nowhere) */ - rect = infoPtr->items[infoPtr->uNumItem-1].rect; - rect.left = rect.right; - rect.right += DIVIDER_WIDTH; - if (PtInRect (&rect, *lpPt)) { - if (bNoWidth) { - *pFlags |= HHT_ONDIVOPEN; - *pItem = infoPtr->uNumItem - 1; - TRACE("ON DIVOPEN %d\n", *pItem); - return; - } - else { - *pFlags |= HHT_ONDIVIDER; - *pItem = infoPtr->uNumItem-1; - TRACE("ON DIVIDER %d\n", *pItem); - return; - } - } - - *pFlags |= HHT_NOWHERE; - *pItem = 1; - TRACE("NOWHERE\n"); - return; - } - } - else { - if (lpPt->x < rect.left) { - TRACE("TO LEFT\n"); - *pFlags |= HHT_TOLEFT; - } - else if (lpPt->x > rect.right) { - TRACE("TO RIGHT\n"); - *pFlags |= HHT_TORIGHT; - } - - if (lpPt->y < rect.top) { - TRACE("ABOVE\n"); - *pFlags |= HHT_ABOVE; - } - else if (lpPt->y > rect.bottom) { - TRACE("BELOW\n"); - *pFlags |= HHT_BELOW; - } - } - - *pItem = 1; - TRACE("flags=0x%X\n", *pFlags); - return; -} - - -static void -HEADER_DrawTrackLine (HWND hwnd, HDC hdc, INT x) -{ - RECT rect; - HPEN hOldPen; - INT oldRop; - - GetClientRect (hwnd, &rect); - - hOldPen = SelectObject (hdc, GetStockObject (BLACK_PEN)); - oldRop = SetROP2 (hdc, R2_XORPEN); - MoveToEx (hdc, x, rect.top, NULL); - LineTo (hdc, x, rect.bottom); - SetROP2 (hdc, oldRop); - SelectObject (hdc, hOldPen); -} - - -static BOOL -HEADER_SendSimpleNotify (HWND hwnd, UINT code) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - NMHDR nmhdr; - - nmhdr.hwndFrom = hwnd; - nmhdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); - nmhdr.code = code; - - return (BOOL)SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr); -} - -static BOOL -HEADER_SendHeaderNotify (HWND hwnd, UINT code, INT iItem, INT mask) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - NMHEADERA nmhdr; - HDITEMA nmitem; - - nmhdr.hdr.hwndFrom = hwnd; - nmhdr.hdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); - nmhdr.hdr.code = code; - nmhdr.iItem = iItem; - nmhdr.iButton = 0; - nmhdr.pitem = &nmitem; - nmitem.mask = mask; - nmitem.cxy = infoPtr->items[iItem].cxy; - nmitem.hbm = infoPtr->items[iItem].hbm; - nmitem.pszText = NULL; - nmitem.cchTextMax = 0; -/* nmitem.pszText = infoPtr->items[iItem].pszText; */ -/* nmitem.cchTextMax = infoPtr->items[iItem].cchTextMax; */ - nmitem.fmt = infoPtr->items[iItem].fmt; - nmitem.lParam = infoPtr->items[iItem].lParam; - nmitem.iOrder = infoPtr->items[iItem].iOrder; - nmitem.iImage = infoPtr->items[iItem].iImage; - - return (BOOL)SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmhdr.hdr.idFrom, (LPARAM)&nmhdr); -} - -/** - * Send Disp Info notification. - * depends on NMHDDISPINFOW having same structure as NMHDDISPINFOA - * (so we handle the two cases only doing a specific cast for pszText). - * - * @param hwnd : hwnd header container handler - * @param mask : notification mask (usually HDI_TEXT or HDI_IMAGE) - * @param pDispInfo : NMHDDISPINFO structure (can be unicode or ansi) - * @param isW : TRUE if dispinfo is Unicode - */ -static BOOL -HEADER_SendHeaderDispInfoNotify(HWND hwnd, INT iItem, INT mask, LPHDITEMW phdi, HEADER_ITEM* lpItem, BOOL isW) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - BOOL ret; - BOOL convertToAnsi = FALSE; - BOOL convertToUnicode = FALSE; - BOOL isUnicodeNotify = FALSE; - NMHDDISPINFOW dispInfo; - - if (mask & HDI_TEXT) - { - convertToAnsi = (isW && infoPtr->nNotifyFormat == NFR_ANSI); - convertToUnicode = (!isW && infoPtr->nNotifyFormat == NFR_UNICODE); - } - isUnicodeNotify = (isW && !convertToAnsi); - - memset(&dispInfo, 0, sizeof(NMHDDISPINFOW)); - dispInfo.hdr.hwndFrom = hwnd; - dispInfo.hdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); - if (isUnicodeNotify || convertToUnicode) - { - dispInfo.hdr.code = HDN_GETDISPINFOW; - } - else - { - dispInfo.hdr.code = HDN_GETDISPINFOA; - } - dispInfo.iItem = iItem; - dispInfo.mask = mask; - /* - dispInfo.pszText = Alloc(sizeof(WCHAR) * 260); - dispInfo.cchTextMax = 260; - */ - ret = (BOOL) SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM) dispInfo.hdr.idFrom, - (LPARAM) &dispInfo); - - TRACE("SendMessage returns(mask:0x%x,str:%s,lParam:%p)\n", - dispInfo.mask, - (isUnicodeNotify ? debugstr_w(dispInfo.pszText) : (LPSTR) dispInfo.pszText), - (void*) dispInfo.lParam); - - if (dispInfo.mask & HDI_DI_SETITEM) - { - if (dispInfo.mask & HDI_IMAGE) - { - lpItem->iImage = dispInfo.iImage; - } - if (dispInfo.mask & HDI_TEXT) - { - if (isUnicodeNotify || convertToUnicode) - Str_SetPtrW(&lpItem->pszText, (LPCWSTR)dispInfo.pszText); - else /*if (convertToAnsi || !isW)*/ - Str_SetPtrAtoW(&lpItem->pszText, (LPCSTR)dispInfo.pszText); - } - - FIXME("NMHDDISPINFO returns with flags HDI_DI_SETITEM\n"); - } - - if (NULL != phdi) - { - if ((phdi->mask & mask) & HDI_IMAGE) - { - phdi->iImage = dispInfo.iImage; - } - if ((phdi->mask & mask) & HDI_TEXT) - { - if (isUnicodeNotify) - Str_GetPtrW ((LPCWSTR)dispInfo.pszText, phdi->pszText, phdi->cchTextMax); - else if (convertToUnicode) - Str_GetPtrWtoA ((LPCWSTR)dispInfo.pszText, (LPSTR)phdi->pszText, phdi->cchTextMax); - else /*if (!isW) */ - Str_GetPtrA ((LPCSTR)dispInfo.pszText, (LPSTR)phdi->pszText, phdi->cchTextMax); - } - } - return ret; -} - - -static BOOL -HEADER_SendClickNotify (HWND hwnd, UINT code, INT iItem) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - NMHEADERA nmhdr; - - nmhdr.hdr.hwndFrom = hwnd; - nmhdr.hdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); - nmhdr.hdr.code = code; - nmhdr.iItem = iItem; - nmhdr.iButton = 0; - nmhdr.pitem = NULL; - - return (BOOL)SendMessageA (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmhdr.hdr.idFrom, (LPARAM)&nmhdr); -} - - -static LRESULT -HEADER_CreateDragImage (HWND hwnd, WPARAM wParam) -{ - FIXME("empty stub!\n"); - return 0; -} - - -static LRESULT -HEADER_DeleteItem (HWND hwnd, WPARAM wParam) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr(hwnd); - INT iItem = (INT)wParam; - - TRACE("[iItem=%d]\n", iItem); - - if ((iItem < 0) || (iItem >= (INT)infoPtr->uNumItem)) - return FALSE; - - if (infoPtr->uNumItem == 1) { - TRACE("Simple delete!\n"); - if (infoPtr->items[0].pszText) - Free (infoPtr->items[0].pszText); - Free (infoPtr->items); - Free(infoPtr->order); - infoPtr->items = 0; - infoPtr->order = 0; - infoPtr->uNumItem = 0; - } - else { - HEADER_ITEM *oldItems = infoPtr->items; - INT i; - INT iOrder; - TRACE("Complex delete! [iItem=%d]\n", iItem); - - for (i = 0; i < infoPtr->uNumItem; i++) - TRACE("%d: order=%d, iOrder=%d, ->iOrder=%d\n", i, infoPtr->order[i], infoPtr->items[i].iOrder, infoPtr->items[infoPtr->order[i]].iOrder); - if (infoPtr->items[iItem].pszText) - Free (infoPtr->items[iItem].pszText); - iOrder = infoPtr->items[iItem].iOrder; - - infoPtr->uNumItem--; - infoPtr->items = Alloc (sizeof (HEADER_ITEM) * infoPtr->uNumItem); - /* pre delete copy */ - if (iItem > 0) { - memcpy (&infoPtr->items[0], &oldItems[0], - iItem * sizeof(HEADER_ITEM)); - } - - /* post delete copy */ - if (iItem < infoPtr->uNumItem) { - memcpy (&infoPtr->items[iItem], &oldItems[iItem+1], - (infoPtr->uNumItem - iItem) * sizeof(HEADER_ITEM)); - } - - /* Correct the orders */ - if (iOrder < infoPtr->uNumItem) - { - memmove(&infoPtr->order[iOrder], &infoPtr->order[iOrder + 1], - (infoPtr->uNumItem - iOrder) * sizeof(INT)); - for (i = 0; i < infoPtr->uNumItem; i++) - { - if (infoPtr->order[i] > iItem) - infoPtr->order[i]--; - if (i >= iOrder) - infoPtr->items[infoPtr->order[i]].iOrder = infoPtr->order[i]; - } - } - - for (i = 0; i < infoPtr->uNumItem; i++) - TRACE("%d: order=%d, iOrder=%d, ->iOrder=%d\n", i, infoPtr->order[i], infoPtr->items[i].iOrder, infoPtr->items[infoPtr->order[i]].iOrder); - Free (oldItems); - } - - HEADER_SetItemBounds (hwnd); - - InvalidateRect(hwnd, NULL, FALSE); - - return TRUE; -} - - -static LRESULT -HEADER_GetImageList (HWND hwnd) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - - return (LRESULT)infoPtr->himl; -} - - -static LRESULT -HEADER_GetItemT (HWND hwnd, INT nItem, LPHDITEMW phdi, BOOL bUnicode) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HEADER_ITEM *lpItem; - - if (!phdi) - return FALSE; - - TRACE("[nItem=%d]\n", nItem); - - if (phdi->mask == 0) - return TRUE; - - if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem)) - lpItem = NULL; - else - lpItem = &infoPtr->items[nItem]; - - if (phdi->mask & HDI_BITMAP) - phdi->hbm = (lpItem != NULL) ? lpItem->hbm : 0; - - if (phdi->mask & HDI_FORMAT) - phdi->fmt = (lpItem != NULL) ? lpItem->fmt : 0; - - if (phdi->mask & HDI_WIDTH) - phdi->cxy = (lpItem != NULL) ? lpItem->cxy : 0; - - if (phdi->mask & HDI_LPARAM) - phdi->lParam = (lpItem != NULL) ? lpItem->lParam : 0; - - if (phdi->mask & HDI_IMAGE) - { - phdi->iImage = (lpItem != NULL) ? lpItem->iImage : 0; - if (lpItem->iImage == I_IMAGECALLBACK) - { - HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_IMAGE, phdi, lpItem, bUnicode); - } - } - - if (phdi->mask & HDI_ORDER) - phdi->iOrder = (lpItem != NULL) ? lpItem->iOrder : 0; [truncated at 1000 lines; 129832 more skipped]

1 0

[gvg] 19620: Update status
by gvg＠svn.reactos.com 26 Nov '05

26 Nov '05

Update status Modified: trunk/reactos/media/doc/README.WINE _____ Modified: trunk/reactos/media/doc/README.WINE --- trunk/reactos/media/doc/README.WINE 2005-11-26 09:49:14 UTC (rev 19619) +++ trunk/reactos/media/doc/README.WINE 2005-11-26 09:50:28 UTC (rev 19620) @@ -26,52 +26,53 @@ work to import a new dll. The following build tools are shared with Wine. -reactos/tools/unicode # Synced to Wine-0_9_1 -reactos/tools/wpp # Synced to Wine-0_9_1 +reactos/tools/unicode # Synced to Wine-0_9_2 +reactos/tools/wpp # Synced to Wine-0_9_2 reactos/tools/bin2res # Resource to binary converter -reactos/tools/winebuild # Synced to Wine-0_9_1 +reactos/tools/winebuild # Synced to Wine-0_9_2 reactos/tools/wmc # Wine Message Compiler -reactos/tools/wrc # Synced to Wine-0_9_1 +reactos/tools/wrc # Synced to Wine-0_9_2 reactos/tools/widl # Forked at Wine-20050930 The following libraries are shared with Wine. -reactos/lib/cabinet # Synced to Wine-0_9_1 -reactos/lib/comctl32 # Synced to Wine-0_9_1 -reactos/lib/comdlg32 # Synced to Wine-0_9_1 -reactos/lib/crypt32 # Synced to Wine-0_9_1 +reactos/lib/avifil32 # Synced to Wine-0_9_2 +reactos/lib/cabinet # Synced to Wine-0_9_2 +reactos/lib/comctl32 # Synced to Wine-0_9_2 +reactos/lib/comdlg32 # Synced to Wine-0_9_2 +reactos/lib/crypt32 # Synced to Wine-0_9_2 reactos/lib/dbghelp # -reactos/lib/dinput # Synced to Wine-0_9_1 -reactos/lib/dinput8 # Synced to Wine-0_9_1 -reactos/lib/dplay # Synced to Wine-0_9_1 -reactos/lib/dplayx # Synced to Wine-0_9_1 -reactos/lib/icmp # Synced to Wine-0_9_1 +reactos/lib/dinput # Synced to Wine-0_9_2 +reactos/lib/dinput8 # Synced to Wine-0_9_2 +reactos/lib/dplay # Synced to Wine-0_9_2 +reactos/lib/dplayx # Synced to Wine-0_9_2 +reactos/lib/icmp # Synced to Wine-0_9_2 reactos/lib/iphlpapi # Out of sync reactos/lib/imagehlp # Patches for BindImage need review and submission to winehq. reactos/lib/msvcrt20 # Out of sync -reactos/lib/mpr # Synced to Wine-0_9_1 +reactos/lib/mpr # Synced to Wine-0_9_2 reactos/lib/msacm # Out of sync -reactos/lib/msimg32 # Synced to Wine-0_9_1 -reactos/lib/msi # Synced to Wine-0_9_1 +reactos/lib/msimg32 # Synced to Wine-0_9_2 +reactos/lib/msi # Synced to Wine-0_9_2 reactos/lib/msvideo # Out of sync -reactos/lib/netapi32 # Synced to Wine-0_9_1 -reactos/lib/objsel # Synced to Wine-0_9_1 +reactos/lib/netapi32 # Synced to Wine-0_9_2 +reactos/lib/objsel # Synced to Wine-0_9_2 reactos/lib/odbc32 # Out of sync. Depends on port of Linux ODBC. -reactos/lib/ole32 # Synced to Wine-0_9_1 -reactos/lib/oleaut32 # Synced to Wine-0_9_1 -reactos/lib/oledlg # Synced to Wine-0_9_1 -reactos/lib/olepro32 # Synced to Wine-0_9_1 -reactos/lib/riched20 # Synced to Wine-0_9_1 -reactos/lib/richedit # Synced to Wine-0_9_1 -reactos/lib/rpcrt4 # Synced to Wine-0_9_1 +reactos/lib/ole32 # Synced to Wine-0_9_2 +reactos/lib/oleaut32 # Synced to Wine-0_9_2 +reactos/lib/oledlg # Synced to Wine-0_9_2 +reactos/lib/olepro32 # Synced to Wine-0_9_2 +reactos/lib/riched20 # Synced to Wine-0_9_2 +reactos/lib/richedit # Synced to Wine-0_9_2 +reactos/lib/rpcrt4 # Synced to Wine-0_9_2 reactos/lib/setupapi # Forked at Wine-20050524 -reactos/lib/shell32 # Synced to Wine-0_9_1 -reactos/lib/shdocvw # Synced to Wine-0_9_1 -reactos/lib/shfolder # Synced to Wine-0_9_1 -reactos/lib/shlwapi # Synced to Wine-0_9_1 +reactos/lib/shell32 # Synced to Wine-0_9_2 +reactos/lib/shdocvw # Synced to Wine-0_9_2 +reactos/lib/shfolder # Synced to Wine-0_9_2 +reactos/lib/shlwapi # Synced to Wine-0_9_2 reactos/lib/twain # Out of sync -reactos/lib/urlmon # Synced to Wine-0_9_1 -reactos/lib/uxtheme # Synced to Wine-0_9_1 +reactos/lib/urlmon # Synced to Wine-0_9_2 +reactos/lib/uxtheme # Synced to Wine-0_9_2 reactos/lib/version # Out of sync reactos/lib/wininet # Out of sync reactos/lib/winmm # Forked at Wine-20050628 @@ -81,7 +82,7 @@ ReactOS shares the following programs with Winehq. reactos/subsys/system/regedit # Out of sync reactos/subsys/system/expand # Out of sync -reactos/subsys/system/msiexec # Synced to Wine-0_9_1 +reactos/subsys/system/msiexec # Synced to Wine-0_9_2 In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files

1 0

[gvg] 19618: Sync to Wine-0_9_2:
by gvg＠svn.reactos.com 26 Nov '05

26 Nov '05

Sync to Wine-0_9_2: Markus Amsler <markus.amsler(a)oribi.org> - Improve c2man Documented-Total count. Changes: - add missing returns section Modified: trunk/reactos/lib/uxtheme/draw.c _____ Modified: trunk/reactos/lib/uxtheme/draw.c --- trunk/reactos/lib/uxtheme/draw.c 2005-11-26 09:40:12 UTC (rev 19617) +++ trunk/reactos/lib/uxtheme/draw.c 2005-11-26 09:45:23 UTC (rev 19618) @@ -180,7 +180,7 @@ } } } - /* If an image couldnt be selected, choose the first one */ + /* If an image couldn't be selected, choose the first one */ return MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE1); } else if(imageselecttype == IST_SIZE) { @@ -224,7 +224,7 @@ return fileProp; } } - /* If an image couldnt be selected, choose the smallest one */ + /* If an image couldn't be selected, choose the smallest one */ return MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE1); } return NULL;

1 0

[gvg] 19617: Sync to Wine-0_9_2:
by gvg＠svn.reactos.com 26 Nov '05

26 Nov '05

Sync to Wine-0_9_2: YunSong Hwang <hys545(a)dreamwiz.com> - Update Korean translations. - Add Korean translations. Jacek Caban <jacek(a)codeweavers.com> - Beginning implementation of Navigate2. - Create window in SetClientSite and return it in IOleInPlaceSite::GetWindow. - Added IOleInPlaceSite stub implementation. - Free ConnectionPoint objects (fix memory leak). - Added OLEIVERB_INPLACEACTIVATE implementation in IOleObject::DoVerb. - Added stub implementation of IDocHostUIHandler. - Added IViewObject2 stub implementation. - Added GetHostInfo implementation. - Improve IConnectionPoint handling. Modified: trunk/reactos/include/wine/debug.h Modified: trunk/reactos/lib/shdocvw/Ko.rc Modified: trunk/reactos/lib/shdocvw/client.c Added: trunk/reactos/lib/shdocvw/dochost.c Modified: trunk/reactos/lib/shdocvw/events.c Modified: trunk/reactos/lib/shdocvw/oleobject.c Modified: trunk/reactos/lib/shdocvw/persist.c Modified: trunk/reactos/lib/shdocvw/shdocvw.h Modified: trunk/reactos/lib/shdocvw/shdocvw.xml Modified: trunk/reactos/lib/shdocvw/webbrowser.c Modified: trunk/reactos/lib/uuid/uuid.c Added: trunk/reactos/w32api/include/mshtmhst.h _____ Modified: trunk/reactos/include/wine/debug.h --- trunk/reactos/include/wine/debug.h 2005-11-26 08:21:42 UTC (rev 19616) +++ trunk/reactos/include/wine/debug.h 2005-11-26 09:40:12 UTC (rev 19617) @@ -3,8 +3,8 @@ #include "../roscfg.h" #include <stdarg.h> -#include <windows.h> -#include <wchar.h> +#include <windef.h> +#include <winnt.h> /* Add ROS Master debug functions if not added yet */ #ifndef __INTERNAL_DEBUG _____ Modified: trunk/reactos/lib/shdocvw/Ko.rc --- trunk/reactos/lib/shdocvw/Ko.rc 2005-11-26 08:21:42 UTC (rev 19616) +++ trunk/reactos/lib/shdocvw/Ko.rc 2005-11-26 09:40:12 UTC (rev 19617) @@ -30,7 +30,7 @@ STRINGTABLE BEGIN - 1001 "This application is requesting an ActiveX browser object\n" \ - "but the Mozilla Active X control is currently not installed." \ - "Do you wish to download and install it?" + 1001 "?? Ã«?Î©??? ¥Îã??Û?ó¢? ?ÛÂ¾?ý?· ????©ª ?õ?©Ãi?¤??.\n" \ + "?ÎÀ»?¬ ©?·Â¾ ¥Îã??Û ?ó¢? ??ã«ÀÐ?? Ã÷?þ ???íÁÃ¥¯?Í?÷ ¥?¢??¤? ?." \ + "?þ¢??? ???¯À?ÁÕÃÏ?¡ ???íÃ¤??¢??¤?¯?" END _____ Modified: trunk/reactos/lib/shdocvw/client.c --- trunk/reactos/lib/shdocvw/client.c 2005-11-26 08:21:42 UTC (rev 19616) +++ trunk/reactos/lib/shdocvw/client.c 2005-11-26 09:40:12 UTC (rev 19617) @@ -16,7 +16,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define COBJMACROS #include "wine/debug.h" #include "shdocvw.h" @@ -42,6 +41,12 @@ }else if(IsEqualGUID(&IID_IOleInPlaceSite, riid)) { TRACE("(%p)->(IID_IOleInPlaceSite %p)\n", This, ppv); *ppv = INPLACESITE(This); + }else if(IsEqualGUID(&IID_IDocHostUIHandler, riid)) { + TRACE("(%p)->(IID_IDocHostUIHandler %p)\n", This, ppv); + *ppv = DOCHOSTUI(This); + }else if(IsEqualGUID(&IID_IDocHostUIHandler2, riid)) { + TRACE("(%p)->(IID_IDocHostUIHandler2 %p)\n", This, ppv); + *ppv = DOCHOSTUI2(This); } if(*ppv) { @@ -146,8 +151,11 @@ static HRESULT WINAPI InPlaceSite_GetWindow(IOleInPlaceSite *iface, HWND *phwnd) { WebBrowser *This = INPLACESITE_THIS(iface); - FIXME("(%p)->(%p)\n", This, phwnd); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, phwnd); + + *phwnd = This->doc_view_hwnd; + return S_OK; } static HRESULT WINAPI InPlaceSite_ContextSensitiveHelp(IOleInPlaceSite *iface, BOOL fEnterMode) _____ Copied: trunk/reactos/lib/shdocvw/dochost.c (from rev 19593, vendor/wine/dlls/shdocvw/current/dochost.c) Property changes on: trunk/reactos/lib/shdocvw/dochost.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shdocvw/events.c --- trunk/reactos/lib/shdocvw/events.c 2005-11-26 08:21:42 UTC (rev 19616) +++ trunk/reactos/lib/shdocvw/events.c 2005-11-26 09:40:12 UTC (rev 19617) @@ -27,11 +27,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); -static IConnectionPointImpl SHDOCVW_ConnectionPoint; +typedef struct { + const IConnectionPointVtbl *lpConnectionPointVtbl; -static const GUID IID_INotifyDBEvents = - { 0xdb526cc0, 0xd188, 0x11cd, { 0xad, 0x48, 0x00, 0xaa, 0x00, 0x3c, 0x9c, 0xb6 } }; + WebBrowser *webbrowser; + IID iid; +} ConnectionPoint; + +#define CONPOINT(x) ((IConnectionPoint*) &(x)->lpConnectionPointVtbl) + /********************************************************************** * Implement the IConnectionPointContainer interface */ @@ -70,27 +75,31 @@ { WebBrowser *This = CONPTCONT_THIS(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppCP); + if(!ppCP) { + WARN("ppCP == NULL\n"); + return E_POINTER; + } - /* For now, return the same IConnectionPoint object for both - * event interface requests. - */ - if (IsEqualGUID (&IID_INotifyDBEvents, riid)) - { - TRACE("Returning connection point %p for IID_INotifyDBEvents\n", - &SHDOCVW_ConnectionPoint); - *ppCP = (LPCONNECTIONPOINT)&SHDOCVW_ConnectionPoint; - return S_OK; + *ppCP = NULL; + + if(IsEqualGUID(&DIID_DWebBrowserEvents2, riid)) { + TRACE("(%p)->(DIID_DWebBrowserEvents2 %p)\n", This, ppCP); + *ppCP = This->cp_wbe2; + }else if(IsEqualGUID(&DIID_DWebBrowserEvents, riid)) { + TRACE("(%p)->(DIID_DWebBrowserEvents %p)\n", This, ppCP); + *ppCP = This->cp_wbe; + }else if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { + TRACE("(%p)->(IID_IPropertyNotifySink %p)\n", This, ppCP); + *ppCP = This->cp_pns; } - else if (IsEqualGUID (&IID_IPropertyNotifySink, riid)) - { - TRACE("Returning connection point %p for IID_IPropertyNotifySink\n", - &SHDOCVW_ConnectionPoint); - *ppCP = (LPCONNECTIONPOINT)&SHDOCVW_ConnectionPoint; + + if(*ppCP) { + IConnectionPoint_AddRef(*ppCP); return S_OK; } - return E_FAIL; + WARN("Unsupported IID %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; } #undef CONPTCONT_THIS @@ -109,97 +118,125 @@ * Implement the IConnectionPoint interface */ -static HRESULT WINAPI WBCP_QueryInterface(LPCONNECTIONPOINT iface, - REFIID riid, LPVOID *ppobj) +#define CONPOINT_THIS(iface) DEFINE_THIS(ConnectionPoint, ConnectionPoint, iface) + +static HRESULT WINAPI ConnectionPoint_QueryInterface(IConnectionPoint *iface, + REFIID riid, LPVOID *ppv) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + ConnectionPoint *This = CONPOINT_THIS(iface); - if (ppobj == NULL) return E_POINTER; - + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = CONPOINT(This); + }else if(IsEqualGUID(&IID_IConnectionPoint, riid)) { + TRACE("(%p)->(IID_IConnectionPoint %p)\n", This, ppv); + *ppv = CONPOINT(This); + } + + if(*ppv) { + IWebBrowser2_AddRef(WEBBROWSER(This->webbrowser)); + return S_OK; + } + + WARN("Unsupported interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } -static ULONG WINAPI WBCP_AddRef(LPCONNECTIONPOINT iface) +static ULONG WINAPI ConnectionPoint_AddRef(IConnectionPoint *iface) { - SHDOCVW_LockModule(); - - return 2; /* non-heap based object */ + ConnectionPoint *This = CONPOINT_THIS(iface); + return IWebBrowser2_AddRef(WEBBROWSER(This->webbrowser)); } -static ULONG WINAPI WBCP_Release(LPCONNECTIONPOINT iface) +static ULONG WINAPI ConnectionPoint_Release(IConnectionPoint *iface) { - SHDOCVW_UnlockModule(); - - return 1; /* non-heap based object */ + ConnectionPoint *This = CONPOINT_THIS(iface); + return IWebBrowser2_Release(WEBBROWSER(This->webbrowser)); } -static HRESULT WINAPI WBCP_GetConnectionInterface(LPCONNECTIONPOINT iface, IID* pIId) +static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *pIID) { - FIXME("stub: %s\n", debugstr_guid(pIId)); - return S_OK; -} + ConnectionPoint *This = CONPOINT_THIS(iface); -/* Get this connection point's owning container */ -static HRESULT WINAPI -WBCP_GetConnectionPointContainer(LPCONNECTIONPOINT iface, - LPCONNECTIONPOINTCONTAINER *ppCPC) -{ - FIXME("stub: IConnectionPointContainer = %p\n", *ppCPC); + TRACE("(%p)->(%p)\n", This, pIID); + + memcpy(pIID, &This->iid, sizeof(IID)); return S_OK; } -/* Connect the pUnkSink event-handling implementation (in the control site) - * to this connection point. Return a handle to this connection in - * pdwCookie (for later use in Unadvise()). - */ -static HRESULT WINAPI WBCP_Advise(LPCONNECTIONPOINT iface, - LPUNKNOWN pUnkSink, DWORD *pdwCookie) +static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoint *iface, + IConnectionPointContainer **ppCPC) { - static int new_cookie; + ConnectionPoint *This = CONPOINT_THIS(iface); - FIXME("stub: IUnknown = %p, connection cookie = %ld\n", pUnkSink, *pdwCookie); + TRACE("(%p)->(%p)\n", This, ppCPC); - *pdwCookie = ++new_cookie; - TRACE ("Returning cookie = %ld\n", *pdwCookie); - + *ppCPC = CONPTCONT(This->webbrowser); return S_OK; } -/* Disconnect this implementation from the connection point. */ -static HRESULT WINAPI WBCP_Unadvise(LPCONNECTIONPOINT iface, - DWORD dwCookie) +static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *pUnkSink, + DWORD *pdwCookie) { - FIXME("stub: cookie to disconnect = %lx\n", dwCookie); - return S_OK; + ConnectionPoint *This = CONPOINT_THIS(iface); + FIXME("(%p)->(%p %p)\n", This, pUnkSink, pdwCookie); + return E_NOTIMPL; } -/* Get a list of connections in this connection point. */ -static HRESULT WINAPI WBCP_EnumConnections(LPCONNECTIONPOINT iface, - LPENUMCONNECTIONS *ppEnum) +static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dwCookie) { - FIXME("stub: IEnumConnections = %p\n", *ppEnum); - return S_OK; + ConnectionPoint *This = CONPOINT_THIS(iface); + FIXME("(%p)->(%ld)\n", This, dwCookie); + return E_NOTIMPL; } -/********************************************************************** - * IConnectionPoint virtual function table for IE Web Browser component - */ +static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, + IEnumConnections **ppEnum) +{ + ConnectionPoint *This = CONPOINT_THIS(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} -static const IConnectionPointVtbl WBCP_Vtbl = +#undef CONPOINT_THIS + +static const IConnectionPointVtbl ConnectionPointVtbl = { - WBCP_QueryInterface, - WBCP_AddRef, - WBCP_Release, - WBCP_GetConnectionInterface, - WBCP_GetConnectionPointContainer, - WBCP_Advise, - WBCP_Unadvise, - WBCP_EnumConnections + ConnectionPoint_QueryInterface, + ConnectionPoint_AddRef, + ConnectionPoint_Release, + ConnectionPoint_GetConnectionInterface, + ConnectionPoint_GetConnectionPointContainer, + ConnectionPoint_Advise, + ConnectionPoint_Unadvise, + ConnectionPoint_EnumConnections }; -static IConnectionPointImpl SHDOCVW_ConnectionPoint = {&WBCP_Vtbl}; +static void ConnectionPoint_Create(WebBrowser *wb, REFIID riid, IConnectionPoint **cp) +{ + ConnectionPoint *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(ConnectionPoint)); + ret->lpConnectionPointVtbl = &ConnectionPointVtbl; + ret->webbrowser = wb; + memcpy(&ret->iid, riid, sizeof(IID)); + + *cp = CONPOINT(ret); +} + void WebBrowser_Events_Init(WebBrowser *This) { This->lpConnectionPointContainerVtbl = &ConnectionPointContainerVtbl; + + ConnectionPoint_Create(This, &DIID_DWebBrowserEvents2, &This->cp_wbe2); + ConnectionPoint_Create(This, &DIID_DWebBrowserEvents, &This->cp_wbe); + ConnectionPoint_Create(This, &IID_IPropertyNotifySink, &This->cp_pns); } + +void WebBrowser_Events_Destroy(WebBrowser *This) +{ + HeapFree(GetProcessHeap(), 0, This->cp_wbe2); + HeapFree(GetProcessHeap(), 0, This->cp_wbe); + HeapFree(GetProcessHeap(), 0, This->cp_pns); +} _____ Modified: trunk/reactos/lib/shdocvw/oleobject.c --- trunk/reactos/lib/shdocvw/oleobject.c 2005-11-26 08:21:42 UTC (rev 19616) +++ trunk/reactos/lib/shdocvw/oleobject.c 2005-11-26 09:40:12 UTC (rev 19617) @@ -23,13 +23,90 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define COBJMACROS #include <string.h> #include "wine/debug.h" #include "shdocvw.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +static ATOM doc_view_atom = 0; +static ATOM shell_embedding_atom = 0; + +static LRESULT WINAPI doc_view_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + return DefWindowProcA(hwnd, msg, wParam, lParam); +} + +static LRESULT WINAPI shell_embedding_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + return DefWindowProcA(hwnd, msg, wParam, lParam); +} + +static void create_doc_view_hwnd(WebBrowser *This) +{ + static const WCHAR wszShell_DocObject_View[] = + {'S','h','e','l','l',' ','D','o','c','O','b','j','e','c','t',' ','V','i','e','w',0}; + + if(!doc_view_atom) { + static WNDCLASSEXW wndclass = { + sizeof(wndclass), + CS_PARENTDC, + doc_view_proc, + 0, 0 /* native uses 4*/, NULL, NULL, NULL, + (HBRUSH)COLOR_WINDOWFRAME, NULL, + wszShell_DocObject_View, + NULL + }; + + wndclass.hInstance = shdocvw_hinstance; + + doc_view_atom = RegisterClassExW(&wndclass); + } + + This->doc_view_hwnd = CreateWindowExW(0, wszShell_DocObject_View, NULL, + WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP | WS_MAXIMIZEBOX, + 0, 0, 0, 0, This->shell_embedding_hwnd, + NULL, shdocvw_hinstance, This); +} + +static void create_shell_embedding_hwnd(WebBrowser *This) +{ + IOleInPlaceSite *inplace; + HWND parent = NULL; + HRESULT hres; + + static const WCHAR wszShellEmbedding[] = + {'S','h','e','l','l',' ','E','m','b','e','d','d','i','n','g',0}; + + if(!shell_embedding_atom) { + static WNDCLASSEXW wndclass = { + sizeof(wndclass), + CS_DBLCLKS, + shell_embedding_proc, + 0, 0 /* native uses 8 */, NULL, NULL, NULL, + (HBRUSH)COLOR_WINDOWFRAME, NULL, + wszShellEmbedding, + NULL + }; + wndclass.hInstance = shdocvw_hinstance; + + RegisterClassExW(&wndclass); + } + + hres = IOleClientSite_QueryInterface(This->client, &IID_IOleInPlaceSite, (void**)&inplace); + if(SUCCEEDED(hres)) { + IOleInPlaceSite_GetWindow(inplace, &parent); + IOleInPlaceSite_Release(inplace); + } + + This->shell_embedding_hwnd = CreateWindowExW(0, wszShellEmbedding, NULL, + WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP | WS_MAXIMIZEBOX, + 0, 0, 0, 0, parent, + NULL, shdocvw_hinstance, This); + + create_doc_view_hwnd(This); +} + /********************************************************************** * Implement the IOleObject interface for the WebBrowser control */ @@ -63,13 +140,22 @@ if(This->client == pClientSite) return S_OK; + if(This->doc_view_hwnd) + DestroyWindow(This->doc_view_hwnd); + if(This->shell_embedding_hwnd) + DestroyWindow(This->shell_embedding_hwnd); + if(This->client) IOleClientSite_Release(This->client); - if(pClientSite) - IOleClientSite_AddRef(pClientSite); + This->client = pClientSite; + if(!pClientSite) + return S_OK; + + IOleClientSite_AddRef(pClientSite); - This->client = pClientSite; + create_shell_embedding_hwnd(This); + return S_OK; } @@ -177,6 +263,7 @@ &This->pos_rect, &This->clip_rect, &This->frameinfo); + IOleInPlaceSite_Release(inplace); if(This->client) { @@ -508,7 +595,7 @@ void WebBrowser_OleObject_Destroy(WebBrowser *This) { if(This->client) - IOleClientSite_Release(This->client); + IOleObject_SetClientSite(OLEOBJ(This), NULL); if(This->container) IOleContainer_Release(This->container); if(This->frame) _____ Modified: trunk/reactos/lib/shdocvw/persist.c --- trunk/reactos/lib/shdocvw/persist.c 2005-11-26 08:21:42 UTC (rev 19616) +++ trunk/reactos/lib/shdocvw/persist.c 2005-11-26 09:40:12 UTC (rev 19617) @@ -19,7 +19,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define COBJMACROS #include "wine/debug.h" #include "shdocvw.h" _____ Modified: trunk/reactos/lib/shdocvw/shdocvw.h --- trunk/reactos/lib/shdocvw/shdocvw.h 2005-11-26 08:21:42 UTC (rev 19616) +++ trunk/reactos/lib/shdocvw/shdocvw.h 2005-11-26 09:40:12 UTC (rev 19617) @@ -35,6 +35,7 @@ #include "olectl.h" #include "shlobj.h" #include "exdisp.h" +#include "mshtmhst.h" /********************************************************************** * IClassFactory declaration for SHDOCVW.DLL @@ -75,6 +76,7 @@ const IOleClientSiteVtbl *lpOleClientSiteVtbl; const IOleInPlaceSiteVtbl *lpOleInPlaceSiteVtbl; + const IDocHostUIHandler2Vtbl *lpDocHostUIHandlerVtbl; LONG ref; @@ -92,6 +94,15 @@ RECT pos_rect; RECT clip_rect; OLEINPLACEFRAMEINFO frameinfo; + + HWND doc_view_hwnd; + HWND shell_embedding_hwnd; + + /* Connection points */ + + IConnectionPoint *cp_wbe2; + IConnectionPoint *cp_wbe; + IConnectionPoint *cp_pns; } WebBrowser; #define WEBBROWSER(x) ((IWebBrowser*) &(x)->lpWebBrowser2Vtbl) @@ -109,6 +120,8 @@ #define CLIENTSITE(x) ((IOleClientSite*) &(x)->lpOleClientSiteVtbl) #define INPLACESITE(x) ((IOleInPlaceSite*) &(x)->lpOleInPlaceSiteVtbl) +#define DOCHOSTUI(x) ((IDocHostUIHandler*) &(x)->lpDocHostUIHandlerVtbl) +#define DOCHOSTUI2(x) ((IDocHostUIHandler2*) &(x)->lpDocHostUIHandlerVtbl) void WebBrowser_OleObject_Init(WebBrowser*); void WebBrowser_ViewObject_Init(WebBrowser*); @@ -118,21 +131,13 @@ void WebBrowser_Events_Init(WebBrowser*); void WebBrowser_ClientSite_Init(WebBrowser*); +void WebBrowser_DocHost_Init(WebBrowser*); void WebBrowser_OleObject_Destroy(WebBrowser*); +void WebBrowser_Events_Destroy(WebBrowser*); HRESULT WebBrowser_Create(IUnknown*,REFIID,void**); -/********************************************************************** - * IConnectionPoint declaration for SHDOCVW.DLL - */ -typedef struct -{ - /* IUnknown fields */ - const IConnectionPointVtbl *lpVtbl; - LONG ref; -} IConnectionPointImpl; - #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) /********************************************************************** @@ -142,4 +147,6 @@ static inline void SHDOCVW_LockModule(void) { InterlockedIncrement( &SHDOCVW_refCount ); } static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_refCount ); } +extern HINSTANCE shdocvw_hinstance; + #endif /* __WINE_SHDOCVW_H */ _____ Modified: trunk/reactos/lib/shdocvw/shdocvw.xml --- trunk/reactos/lib/shdocvw/shdocvw.xml 2005-11-26 08:21:42 UTC (rev 19616) +++ trunk/reactos/lib/shdocvw/shdocvw.xml 2005-11-26 09:40:12 UTC (rev 19617) @@ -19,6 +19,7 @@ <library>urlmon</library> <file>classinfo.c</file> <file>client.c</file> + <file>dochost.c</file> <file>events.c</file> <file>factory.c</file> <file>misc.c</file> _____ Modified: trunk/reactos/lib/shdocvw/webbrowser.c --- trunk/reactos/lib/shdocvw/webbrowser.c 2005-11-26 08:21:42 UTC (rev 19616) +++ trunk/reactos/lib/shdocvw/webbrowser.c 2005-11-26 09:40:12 UTC (rev 19617) @@ -19,7 +19,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define COBJMACROS #include "wine/debug.h" #include "shdocvw.h" #include "mshtml.h" @@ -126,6 +125,7 @@ IUnknown_Release(This->document); WebBrowser_OleObject_Destroy(This); + WebBrowser_Events_Destroy(This); HeapFree(GetProcessHeap(), 0, This); SHDOCVW_UnlockModule(); @@ -783,6 +783,7 @@ WebBrowser_Misc_Init(ret); WebBrowser_Events_Init(ret); WebBrowser_ClientSite_Init(ret); + WebBrowser_DocHost_Init(ret); hres = IWebBrowser_QueryInterface(WEBBROWSER(ret), riid, ppv); if(SUCCEEDED(hres)) { _____ Modified: trunk/reactos/lib/uuid/uuid.c --- trunk/reactos/lib/uuid/uuid.c 2005-11-26 08:21:42 UTC (rev 19616) +++ trunk/reactos/lib/uuid/uuid.c 2005-11-26 09:40:12 UTC (rev 19617) @@ -43,6 +43,7 @@ #include "ocidl.h" +#include "mshtmhst.h" #include "docobj.h" #include "exdisp.h" _____ Added: trunk/reactos/w32api/include/mshtmhst.h --- trunk/reactos/w32api/include/mshtmhst.h 2005-11-26 08:21:42 UTC (rev 19616) +++ trunk/reactos/w32api/include/mshtmhst.h 2005-11-26 09:40:12 UTC (rev 19617) @@ -0,0 +1,977 @@ +/*** Autogenerated by WIDL 0.9.2 from mshtmhst.idl - Do not edit ***/ +#include <rpc.h> +#include <rpcndr.h> + +#ifndef __WIDL_MSHTMHST_H +#define __WIDL_MSHTMHST_H +#ifdef __cplusplus +extern "C" { +#endif +#include <ocidl.h> +#include <objidl.h> +#include <oleidl.h> +#include <oaidl.h> +#include <docobj.h> +#define CONTEXT_MENU_DEFAULT 0 +#define CONTEXT_MENU_IMAGE 1 +#define CONTEXT_MENU_CONTROL 2 +#define CONTEXT_MENU_TABLE 3 +#define CONTEXT_MENU_TEXTSELECT 4 +#define CONTEXT_MENU_ANCHOR 5 +#define CONTEXT_MENU_UNKNOWN 6 +#define CONTEXT_MENU_IMGDYNSRC 7 +#define CONTEXT_MENU_IMGART 8 +#define CONTEXT_MENU_DEBUG 9 +#define CONTEXT_MENU_VSCROLL 10 +#define CONTEXT_MENU_HSCROLL 11 +#define MENUEXT_SHOWDIALOG 1 +#define DOCHOSTUIFLAG_BROWSER (DOCHOSTUIFLAG_DISABLE_HELP_MENU|DOCHOSTUIFLAG_DISABLE_SCRIPT_INACTIVE) +#define HTMLDLG_NOUI 0x0010 +#define HTMLDLG_MODAL 0x0020 +#define HTMLDLG_MODELESS 0x0040 +#define HTMLDLG_PRINT_TEMPLATE 0x0080 +#define HTMLDLG_VERIFY 0x0100 +#define PRINT_DONTBOTHERUSER 0x0001 +#define PRINT_WAITFORCOMPLETION 0x0002 +#ifndef __IHTMLWindow2_FWD_DEFINED__ +#define __IHTMLWindow2_FWD_DEFINED__ +typedef interface IHTMLWindow2 IHTMLWindow2; +#endif +#ifndef __IHostDialogHelper_FWD_DEFINED__ +#define __IHostDialogHelper_FWD_DEFINED__ +typedef struct IHostDialogHelper IHostDialogHelper; +#endif + +/********************************************************************** ******* + * IHostDialogHelper interface + */ +#ifndef __IHostDialogHelper_INTERFACE_DEFINED__ +#define __IHostDialogHelper_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IHostDialogHelper, 0x53dec138, 0xa51e, 0x11d2, 0x86,0x1e, 0x00,0xc0,0x4f,0xa3,0x5c,0x89); +#if defined(__cplusplus) && !defined(CINTERFACE) +struct IHostDialogHelper : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE ShowHTMLDialog( + HWND hwndParent, + IMoniker* pMk, + VARIANT* pvarArgIn, + WCHAR* pchOptions, + VARIANT* pvarArgOut, + IUnknown* punkHost) = 0; + +}; +#else +typedef struct IHostDialogHelperVtbl IHostDialogHelperVtbl; +struct IHostDialogHelper { + const IHostDialogHelperVtbl* lpVtbl; +}; +struct IHostDialogHelperVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IHostDialogHelper* This, + REFIID riid, + void** ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IHostDialogHelper* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IHostDialogHelper* This); + + /*** IHostDialogHelper methods ***/ + HRESULT (STDMETHODCALLTYPE *ShowHTMLDialog)( + IHostDialogHelper* This, + HWND hwndParent, + IMoniker* pMk, + VARIANT* pvarArgIn, + WCHAR* pchOptions, + VARIANT* pvarArgOut, + IUnknown* punkHost); + + END_INTERFACE +}; + +#ifdef COBJMACROS +/*** IUnknown methods ***/ +#define IHostDialogHelper_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IHostDialogHelper_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IHostDialogHelper_Release(p) (p)->lpVtbl->Release(p) +/*** IHostDialogHelper methods ***/ +#define IHostDialogHelper_ShowHTMLDialog(p,a,b,c,d,e,f) (p)->lpVtbl->ShowHTMLDialog(p,a,b,c,d,e,f) +#endif + +#endif + +HRESULT CALLBACK IHostDialogHelper_ShowHTMLDialog_Proxy( + IHostDialogHelper* This, + HWND hwndParent, + IMoniker* pMk, + VARIANT* pvarArgIn, + WCHAR* pchOptions, + VARIANT* pvarArgOut, + IUnknown* punkHost); +void __RPC_STUB IHostDialogHelper_ShowHTMLDialog_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); + +#endif /* __IHostDialogHelper_INTERFACE_DEFINED__ */ + +/********************************************************************** ******* + * HostDialogHelper coclass + */ + +DEFINE_GUID(CLSID_HostDialogHelper, 0x429af92c, 0xa51f, 0x11d2, 0x86,0x1e, 0x00,0xc0,0x4f,0xa3,0x5c,0x89); + +typedef enum tagDOCHOSTUIDBLCLK { + DOCHOSTUIDBLCLK_DEFAULT = 0, + DOCHOSTUIDBLCLK_SHOWPROPERTIES = 1, + DOCHOSTUIDBLCLK_SHOWCODE = 2 +} DOCHOSTUIDBLCLK; +typedef enum tagDOCHOSTUIFLAG { + DOCHOSTUIFLAG_DIALOG = 0x1, + DOCHOSTUIFLAG_DISABLE_HELP_MENU = 0x2, + DOCHOSTUIFLAG_NO3DBORDER = 0x4, + DOCHOSTUIFLAG_SCROLL_NO = 0x8, + DOCHOSTUIFLAG_DISABLE_SCRIPT_INACTIVE = 0x10, + DOCHOSTUIFLAG_OPENNEWWIN = 0x20, + DOCHOSTUIFLAG_DISABLE_OFFSCREEN = 0x40, + DOCHOSTUIFLAG_FLAT_SCROLLBAR = 0x80, + DOCHOSTUIFLAG_DIV_BLOCKDEFAULT = 0x100, + DOCHOSTUIFLAG_ACTIVATE_CLIENTHIT_ONLY = 0x200, + DOCHOSTUIFLAG_OVERRIDEBEHAVIORFACTORY = 0x400, + DOCHOSTUIFLAG_CODEPAGELINKEDFONTS = 0x800, + DOCHOSTUIFLAG_URL_ENCODING_DISABLE_UTF8 = 0x1000, + DOCHOSTUIFLAG_URL_ENCODING_ENABLE_UTF8 = 0x2000, + DOCHOSTUIFLAG_ENABLE_FORMS_AUTOCOMPLETE = 0x4000, + DOCHOSTUIFLAG_ENABLE_INPLACE_NAVIGATION = 0x10000, + DOCHOSTUIFLAG_IME_ENABLE_RECONVERSION = 0x20000, + DOCHOSTUIFLAG_THEME = 0x40000, + DOCHOSTUIFLAG_NOTHEME = 0x80000, + DOCHOSTUIFLAG_NOPICS = 0x100000, + DOCHOSTUIFLAG_NO3DOUTERBORDER = 0x200000, + DOCHOSTUIFLAG_DISABLE_EDIT_NS_FIXUP = 0x400000, + DOCHOSTUIFLAG_LOCAL_MACHINE_ACCESS_CHECK = 0x800000, + DOCHOSTUIFLAG_DISABLE_UNTRUSTEDPROTOCOL = 0x1000000 +} DOCHOSTUIFLAG; +#ifndef __IDocHostUIHandler_FWD_DEFINED__ +#define __IDocHostUIHandler_FWD_DEFINED__ +typedef struct IDocHostUIHandler IDocHostUIHandler; +#endif + +typedef struct _DOCHOSTUIINFO { + ULONG cbSize; + DWORD dwFlags; + DWORD dwDoubleClick; + OLECHAR *pchHostCss; + OLECHAR *pchHostNS; +} DOCHOSTUIINFO; +/********************************************************************** ******* + * IDocHostUIHandler interface + */ +#ifndef __IDocHostUIHandler_INTERFACE_DEFINED__ +#define __IDocHostUIHandler_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IDocHostUIHandler, 0xbd3f23c0, 0xd43e, 0x11cf, 0x89,0x3b, 0x00,0xaa,0x00,0xbd,0xce,0x1a); +#if defined(__cplusplus) && !defined(CINTERFACE) +struct IDocHostUIHandler : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE ShowContextMenu( + DWORD dwID, + POINT* ppt, + IUnknown* pcmdtReserved, + IDispatch* pdispReserved) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetHostInfo( + DOCHOSTUIINFO* pInfo) = 0; + + virtual HRESULT STDMETHODCALLTYPE ShowUI( + DWORD dwID, + IOleInPlaceActiveObject* pActiveObject, + IOleCommandTarget* pCommandTarget, + IOleInPlaceFrame* pFrame, + IOleInPlaceUIWindow* pDoc) = 0; + + virtual HRESULT STDMETHODCALLTYPE HideUI( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE UpdateUI( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE EnableModeless( + BOOL fEnable) = 0; + + virtual HRESULT STDMETHODCALLTYPE OnDocWindowActivate( + BOOL fActivate) = 0; + + virtual HRESULT STDMETHODCALLTYPE OnFrameWindowActivate( + BOOL fActivate) = 0; + + virtual HRESULT STDMETHODCALLTYPE ResizeBorder( + LPCRECT prcBorder, + IOleInPlaceUIWindow* pUIWindow, + BOOL fRameWindow) = 0; + + virtual HRESULT STDMETHODCALLTYPE TranslateAccelerator( + LPMSG lpMsg, + const GUID* pguidCmdGroup, + DWORD nCmdID) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetOptionKeyPath( + LPOLESTR* pchKey, + DWORD dw) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetDropTarget( + IDropTarget* pDropTarget, + IDropTarget** ppDropTarget) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetExternal( + IDispatch** ppDispatch) = 0; + + virtual HRESULT STDMETHODCALLTYPE TranslateUrl( + DWORD dwTranslate, + OLECHAR* pchURLIn, + OLECHAR** ppchURLOut) = 0; + + virtual HRESULT STDMETHODCALLTYPE FilterDataObject( + IDataObject* pDO, + IDataObject** ppDORet) = 0; + +}; +#else +typedef struct IDocHostUIHandlerVtbl IDocHostUIHandlerVtbl; +struct IDocHostUIHandler { + const IDocHostUIHandlerVtbl* lpVtbl; +}; +struct IDocHostUIHandlerVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IDocHostUIHandler* This, + REFIID riid, + void** ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IDocHostUIHandler* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IDocHostUIHandler* This); + + /*** IDocHostUIHandler methods ***/ + HRESULT (STDMETHODCALLTYPE *ShowContextMenu)( + IDocHostUIHandler* This, + DWORD dwID, + POINT* ppt, + IUnknown* pcmdtReserved, + IDispatch* pdispReserved); + + HRESULT (STDMETHODCALLTYPE *GetHostInfo)( + IDocHostUIHandler* This, + DOCHOSTUIINFO* pInfo); + + HRESULT (STDMETHODCALLTYPE *ShowUI)( + IDocHostUIHandler* This, + DWORD dwID, + IOleInPlaceActiveObject* pActiveObject, + IOleCommandTarget* pCommandTarget, + IOleInPlaceFrame* pFrame, + IOleInPlaceUIWindow* pDoc); + + HRESULT (STDMETHODCALLTYPE *HideUI)( + IDocHostUIHandler* This); + + HRESULT (STDMETHODCALLTYPE *UpdateUI)( + IDocHostUIHandler* This); + + HRESULT (STDMETHODCALLTYPE *EnableModeless)( + IDocHostUIHandler* This, + BOOL fEnable); + + HRESULT (STDMETHODCALLTYPE *OnDocWindowActivate)( + IDocHostUIHandler* This, + BOOL fActivate); + + HRESULT (STDMETHODCALLTYPE *OnFrameWindowActivate)( + IDocHostUIHandler* This, + BOOL fActivate); + + HRESULT (STDMETHODCALLTYPE *ResizeBorder)( + IDocHostUIHandler* This, + LPCRECT prcBorder, + IOleInPlaceUIWindow* pUIWindow, + BOOL fRameWindow); + + HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)( + IDocHostUIHandler* This, + LPMSG lpMsg, + const GUID* pguidCmdGroup, + DWORD nCmdID); + + HRESULT (STDMETHODCALLTYPE *GetOptionKeyPath)( + IDocHostUIHandler* This, + LPOLESTR* pchKey, + DWORD dw); + + HRESULT (STDMETHODCALLTYPE *GetDropTarget)( + IDocHostUIHandler* This, + IDropTarget* pDropTarget, + IDropTarget** ppDropTarget); + + HRESULT (STDMETHODCALLTYPE *GetExternal)( + IDocHostUIHandler* This, + IDispatch** ppDispatch); + + HRESULT (STDMETHODCALLTYPE *TranslateUrl)( + IDocHostUIHandler* This, + DWORD dwTranslate, + OLECHAR* pchURLIn, + OLECHAR** ppchURLOut); + + HRESULT (STDMETHODCALLTYPE *FilterDataObject)( + IDocHostUIHandler* This, + IDataObject* pDO, + IDataObject** ppDORet); + + END_INTERFACE +}; + +#ifdef COBJMACROS +/*** IUnknown methods ***/ +#define IDocHostUIHandler_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDocHostUIHandler_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDocHostUIHandler_Release(p) (p)->lpVtbl->Release(p) +/*** IDocHostUIHandler methods ***/ +#define IDocHostUIHandler_ShowContextMenu(p,a,b,c,d) (p)->lpVtbl->ShowContextMenu(p,a,b,c,d) +#define IDocHostUIHandler_GetHostInfo(p,a) (p)->lpVtbl->GetHostInfo(p,a) +#define IDocHostUIHandler_ShowUI(p,a,b,c,d,e) (p)->lpVtbl->ShowUI(p,a,b,c,d,e) +#define IDocHostUIHandler_HideUI(p) (p)->lpVtbl->HideUI(p) +#define IDocHostUIHandler_UpdateUI(p) (p)->lpVtbl->UpdateUI(p) +#define IDocHostUIHandler_EnableModeless(p,a) (p)->lpVtbl->EnableModeless(p,a) +#define IDocHostUIHandler_OnDocWindowActivate(p,a) (p)->lpVtbl->OnDocWindowActivate(p,a) +#define IDocHostUIHandler_OnFrameWindowActivate(p,a) (p)->lpVtbl->OnFrameWindowActivate(p,a) +#define IDocHostUIHandler_ResizeBorder(p,a,b,c) (p)->lpVtbl->ResizeBorder(p,a,b,c) +#define IDocHostUIHandler_TranslateAccelerator(p,a,b,c) (p)->lpVtbl->TranslateAccelerator(p,a,b,c) +#define IDocHostUIHandler_GetOptionKeyPath(p,a,b) (p)->lpVtbl->GetOptionKeyPath(p,a,b) +#define IDocHostUIHandler_GetDropTarget(p,a,b) (p)->lpVtbl->GetDropTarget(p,a,b) +#define IDocHostUIHandler_GetExternal(p,a) (p)->lpVtbl->GetExternal(p,a) +#define IDocHostUIHandler_TranslateUrl(p,a,b,c) (p)->lpVtbl->TranslateUrl(p,a,b,c) +#define IDocHostUIHandler_FilterDataObject(p,a,b) (p)->lpVtbl->FilterDataObject(p,a,b) +#endif + +#endif + +HRESULT CALLBACK IDocHostUIHandler_ShowContextMenu_Proxy( + IDocHostUIHandler* This, + DWORD dwID, + POINT* ppt, + IUnknown* pcmdtReserved, + IDispatch* pdispReserved); +void __RPC_STUB IDocHostUIHandler_ShowContextMenu_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IDocHostUIHandler_GetHostInfo_Proxy( + IDocHostUIHandler* This, + DOCHOSTUIINFO* pInfo); +void __RPC_STUB IDocHostUIHandler_GetHostInfo_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, [truncated at 1000 lines; 598 more skipped]

1 0

[hpoussin] 19616: Add stub for HalAllocateCrashDumpRegisters
by hpoussin＠svn.reactos.com 26 Nov '05

26 Nov '05

Add stub for HalAllocateCrashDumpRegisters Modified: trunk/reactos/hal/hal/hal.c Modified: trunk/reactos/hal/hal/hal.def Modified: trunk/reactos/hal/halx86/generic/misc.c _____ Modified: trunk/reactos/hal/hal/hal.c --- trunk/reactos/hal/hal/hal.c 2005-11-26 08:19:38 UTC (rev 19615) +++ trunk/reactos/hal/hal/hal.c 2005-11-26 08:21:42 UTC (rev 19616) @@ -126,6 +126,16 @@ } +VOID +NTAPI +HalAllocateCrashDumpRegisters( + ULONG Unknown1, + ULONG Unknown2) +{ + UNIMPLEMENTED; +} + + NTSTATUS NTAPI HalAssignSlotResources( _____ Modified: trunk/reactos/hal/hal/hal.def --- trunk/reactos/hal/hal/hal.def 2005-11-26 08:19:38 UTC (rev 19615) +++ trunk/reactos/hal/hal/hal.def 2005-11-26 08:21:42 UTC (rev 19616) @@ -11,7 +11,7 @@ HalAllProcessorsStarted@0 HalAllocateAdapterChannel@16 HalAllocateCommonBuffer@16 -;HalAllocateCrashDumpRegisters@8 +HalAllocateCrashDumpRegisters@8 HalAssignSlotResources@32 HalBeginSystemInterrupt@12 HalCalibratePerformanceCounter@4 _____ Modified: trunk/reactos/hal/halx86/generic/misc.c --- trunk/reactos/hal/halx86/generic/misc.c 2005-11-26 08:19:38 UTC (rev 19615) +++ trunk/reactos/hal/halx86/generic/misc.c 2005-11-26 08:21:42 UTC (rev 19616) @@ -16,6 +16,17 @@ /* FUNCTIONS ****************************************************************/ + +VOID +NTAPI +HalAllocateCrashDumpRegisters( + ULONG Unknown1, + ULONG Unknown2) +{ + UNIMPLEMENTED; +} + + VOID STDCALL HalHandleNMI(ULONG Unused) {

1 0

[hpoussin] 19615: Install one more time the .SoftwareSettings section in registry (no, I really don't want to create a symlink)
by hpoussin＠svn.reactos.com 26 Nov '05

26 Nov '05

Install one more time the .SoftwareSettings section in registry (no, I really don't want to create a symlink) Modified: trunk/reactos/lib/cpl/desk/classinst.c _____ Modified: trunk/reactos/lib/cpl/desk/classinst.c --- trunk/reactos/lib/cpl/desk/classinst.c 2005-11-26 08:15:41 UTC (rev 19614) +++ trunk/reactos/lib/cpl/desk/classinst.c 2005-11-26 08:19:38 UTC (rev 19615) @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Plug & Play + * PROJECT: ReactOS Display Control Panel * FILE: lib/cpl/desk/classinst.c * PURPOSE: Display class installer * @@ -24,6 +24,8 @@ TCHAR SectionName[MAX_PATH]; TCHAR ServiceName[MAX_SERVICE_NAME_LEN]; SP_DRVINFO_DETAIL_DATA DriverInfoDetailData; + HKEY hDriverKey = INVALID_HANDLE_VALUE; + HKEY hSettingsKey = INVALID_HANDLE_VALUE; HKEY hServicesKey = INVALID_HANDLE_VALUE; HKEY hServiceKey = INVALID_HANDLE_VALUE; HKEY hDeviceSubKey = INVALID_HANDLE_VALUE; @@ -34,6 +36,7 @@ if (InstallFunction != DIF_INSTALLDEVICE) return ERROR_DI_DO_DEFAULT; + /* Set DI_NEEDRESTART flag */ InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); result = SetupDiGetDeviceInstallParams(DeviceInfoSet, DeviceInfoData, &InstallParams); if (!result) @@ -53,6 +56,7 @@ goto cleanup; } + /* Get .inf file name and section name */ DriverInfoData.cbSize = sizeof(SP_DRVINFO_DATA); result = SetupDiGetSelectedDriver(DeviceInfoSet, DeviceInfoData, &DriverInfoData); if (!result) @@ -93,6 +97,7 @@ } _tcscat(SectionName, _T(".SoftwareSettings")); + /* Do normal install */ result = SetupDiInstallDevice(DeviceInfoSet, DeviceInfoData); if (!result) { @@ -101,6 +106,46 @@ goto cleanup; } + /* Open driver registry key and create Settings subkey */ + hDriverKey = SetupDiOpenDevRegKey( + DeviceInfoSet, DeviceInfoData, + DICS_FLAG_GLOBAL, 0, DIREG_DRV, + KEY_CREATE_SUB_KEY); + if (hDriverKey == INVALID_HANDLE_VALUE) + { + rc = GetLastError(); + DPRINT("SetupDiOpenDevRegKey() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegCreateKeyEx( + hDriverKey, L"Settings", + 0, NULL, REG_OPTION_NON_VOLATILE, +#if _WIN32_WINNT >= 0x502 + KEY_READ | KEY_WRITE, +#else + KEY_ALL_ACCESS, +#endif + NULL, &hSettingsKey, &disposition); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegCreateKeyEx() failed with error 0x%lx\n", rc); + goto cleanup; + } + + /* Install .SoftwareSettings to Settings subkey */ + result = SetupInstallFromInfSection( + InstallParams.hwndParent, hInf, SectionName, + SPINST_REGISTRY, hSettingsKey, + NULL, 0, NULL, NULL, + NULL, NULL); + if (!result) + { + rc = GetLastError(); + DPRINT("SetupInstallFromInfSection() failed with error 0x%lx\n", rc); + goto cleanup; + } + + /* Get service name and open service registry key */ result = SetupDiGetDeviceRegistryProperty( DeviceInfoSet, DeviceInfoData, SPDRP_SERVICE, NULL, @@ -147,6 +192,8 @@ } /* Install SoftwareSettings section */ + /* Yes, we're installing this section for the second time. + * We don't want to create a link to Settings subkey */ result = SetupInstallFromInfSection( InstallParams.hwndParent, hInf, SectionName, SPINST_REGISTRY, hDeviceSubKey, @@ -166,6 +213,10 @@ cleanup: if (hInf != INVALID_HANDLE_VALUE) SetupCloseInfFile(hInf); + if (hDriverKey != INVALID_HANDLE_VALUE) + RegCloseKey(hDriverKey); + if (hSettingsKey != INVALID_HANDLE_VALUE) + RegCloseKey(hSettingsKey); if (hServicesKey != INVALID_HANDLE_VALUE) RegCloseKey(hServicesKey); if (hServiceKey != INVALID_HANDLE_VALUE)

1 0

[hpoussin] 19614: Fix French control panel description
by hpoussin＠svn.reactos.com 26 Nov '05

26 Nov '05

Fix French control panel description Modified: trunk/reactos/lib/cpl/sysdm/fr.rc _____ Modified: trunk/reactos/lib/cpl/sysdm/fr.rc --- trunk/reactos/lib/cpl/sysdm/fr.rc 2005-11-26 08:13:04 UTC (rev 19613) +++ trunk/reactos/lib/cpl/sysdm/fr.rc 2005-11-26 08:15:41 UTC (rev 19614) @@ -137,5 +137,5 @@ STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "SystÞme" - IDS_CPLSYSTEMDESCRIPTION "Afficher les informations sur votre odrinateur et changer les paramÞtres du systÞme et du matÚriel." + IDS_CPLSYSTEMDESCRIPTION "Affiche des informations sur votre ordinateur et permet de change les paramÞtres du systÞme et du matÚriel." END

1 0

[hpoussin] 19613: Implement SetupDiGetDeviceInstanceIdW
by hpoussin＠svn.reactos.com 26 Nov '05

26 Nov '05

Implement SetupDiGetDeviceInstanceIdW Fix debug message Modified: trunk/reactos/lib/devmgr/hwpage.c Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/stubs.c _____ Modified: trunk/reactos/lib/devmgr/hwpage.c --- trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 04:29:40 UTC (rev 19612) +++ trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 08:13:04 UTC (rev 19613) @@ -143,7 +143,7 @@ 0, &DeviceInstanceIdLen)) { - DPRINT1("SetupDiGetDeviceInterfaceDetail unexpectedly returned TRUE!\n"); + DPRINT1("SetupDiGetDeviceInstanceId unexpectedly returned TRUE!\n"); goto Cleanup; } _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-11-26 04:29:40 UTC (rev 19612) +++ trunk/reactos/lib/setupapi/devinst.c 2005-11-26 08:13:04 UTC (rev 19613) @@ -3004,7 +3004,7 @@ { BOOL ret = FALSE; - TRACE("%ld %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData); + TRACE("%u %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData); if (!DeviceInfoSet) SetLastError(ERROR_INVALID_PARAMETER); @@ -3063,7 +3063,7 @@ DefaultHandler = SetupDiSelectBestCompatDrv; break; default: - ERR("Install function %lu not supported\n", InstallFunction); + ERR("Install function %u not supported\n", InstallFunction); SetLastError(ERROR_NOT_SUPPORTED); } @@ -3463,6 +3463,71 @@ } /*********************************************************************** + * SetupDiGetDeviceInstanceIdA(SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDeviceInstanceIdA( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + OUT PSTR DeviceInstanceId, + IN DWORD DeviceInstanceIdSize, + OUT PDWORD RequiredSize) +{ + FIXME ("Stub %p %p %p %d %p\n", + DeviceInfoSet, DeviceInfoData, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/********************************************************************** * + * SetupDiGetDeviceInstanceIdW(SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDeviceInstanceIdW( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + OUT PWSTR DeviceInstanceId, + IN DWORD DeviceInstanceIdSize, + OUT PDWORD RequiredSize) +{ + BOOL ret = FALSE; + + TRACE("%p %p %p %lu %p\n", DeviceInfoSet, DeviceInfoData, + DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); + + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_HANDLE); + else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (!DeviceInfoData) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (!DeviceInstanceId && DeviceInstanceIdSize > 0) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInstanceId && DeviceInstanceIdSize == 0) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + struct DeviceInfoElement *DevInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + DWORD required; + + required = (wcslen(DevInfo->DeviceName) + 1) * sizeof(WCHAR); + if (RequiredSize) + *RequiredSize = required; + + if (required <= DeviceInstanceIdSize) + { + wcscpy(DeviceInstanceId, DevInfo->DeviceName); + ret = TRUE; + } + else + SetLastError(ERROR_INSUFFICIENT_BUFFER); + } + + TRACE("Returning 0x%p\n", ret); + return ret; +} + +/********************************************************************** * * SetupDiCreateDevRegKeyA (SETUPAPI.@) */ HKEY WINAPI SetupDiCreateDevRegKeyA( _____ Modified: trunk/reactos/lib/setupapi/stubs.c --- trunk/reactos/lib/setupapi/stubs.c 2005-11-26 04:29:40 UTC (rev 19612) +++ trunk/reactos/lib/setupapi/stubs.c 2005-11-26 08:13:04 UTC (rev 19613) @@ -225,33 +225,8 @@ return TRUE; } -/********************************************************************** * - * SetupDiGetDeviceInstanceIdA(SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetDeviceInstanceIdA(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, - PSTR DeviceInstanceId, DWORD DeviceInstanceIdSize, - PDWORD RequiredSize) -{ - FIXME ("Stub %p %p %p %d %p\n", - DeviceInfoSet, DeviceInfoData, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} /*********************************************************************** - * SetupDiGetDeviceInstanceIdW(SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetDeviceInstanceIdW(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, - PWSTR DeviceInstanceId, DWORD DeviceInstanceIdSize, - PDWORD RequiredSize) -{ - FIXME ("Stub %p %p %p %d %p\n", - DeviceInfoSet, DeviceInfoData, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/********************************************************************** * * SetupDiGetClassDevPropertySheetsA(SETUPAPI.@) */ BOOL WINAPI SetupDiGetClassDevPropertySheetsA(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData,

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005