Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[weiden] 19592: display the device manufacturer

by weiden＠svn.reactos.com

display the device manufacturer Modified: trunk/reactos/lib/devmgr/hwpage.c _____ Modified: trunk/reactos/lib/devmgr/hwpage.c --- trunk/reactos/lib/devmgr/hwpage.c 2005-11-25 23:16:28 UTC (rev 19591) +++ trunk/reactos/lib/devmgr/hwpage.c 2005-11-25 23:36:32 UTC (rev 19592) @@ -49,6 +49,7 @@ { GUID Guid; HDEVINFO hDevInfo; + INT ImageIndex; INT ItemCount; PHWDEVINFO HwDevInfo; } HWCLASSDEVINFO, *PHWCLASSDEVINFO; @@ -129,98 +130,203 @@ UpdateControlStates(IN PHARDWARE_PAGE_DATA hpd) { PHWDEVINFO HwDevInfo; + HWND hBtnTroubleShoot, hBtnProperties; + DWORD RegDataType; + + hBtnTroubleShoot = GetDlgItem(hpd->hWnd, + IDC_TROUBLESHOOT); + hBtnProperties = GetDlgItem(hpd->hWnd, + IDC_PROPERTIES); HwDevInfo = (PHWDEVINFO)ListViewGetSelectedItemData(hpd->hWndDevList); if (HwDevInfo != NULL) { - /* FIXME - update static controls and enable buttons */ + /* update static controls */ + WCHAR szBuffer[256]; + LPWSTR szFormatted = NULL; + + if (!SetupDiGetDeviceRegistryProperty(HwDevInfo->ClassDevInfo->hDevInfo, + &HwDevInfo->DevInfoData, + SPDRP_MFG, + &RegDataType, + (PBYTE)szBuffer, + sizeof(szBuffer), + NULL) || + RegDataType != REG_SZ) + { + /* FIXME - check string for NULL termination! */ + szBuffer[0] = L'\0'; + } + if (LoadAndFormatString(hDllInstance, + IDS_MANUFACTURER, + &szFormatted, + szBuffer) != 0) + { + SetDlgItemText(hpd->hWnd, + IDC_MANUFACTURER, + szFormatted); + LocalFree((HLOCAL)szFormatted); + } + + /* FIXME - Display location and status */ } else { - /* FIXME - clear static controls and disable buttons */ + /* clear static controls */ + SetDlgItemText(hpd->hWnd, + IDC_MANUFACTURER, + NULL); + SetDlgItemText(hpd->hWnd, + IDC_LOCATION, + NULL); + SetDlgItemText(hpd->hWnd, + IDC_STATUS, + NULL); } + + EnableWindow(hBtnTroubleShoot, + HwDevInfo != NULL); + EnableWindow(hBtnTroubleShoot, + hBtnProperties != NULL); } +static VOID +FreeDevicesList(IN PHARDWARE_PAGE_DATA hpd) +{ + PHWCLASSDEVINFO ClassDevInfo, LastClassDevInfo; + ClassDevInfo = hpd->ClassDevInfo; + LastClassDevInfo = ClassDevInfo + hpd->NumberOfGuids; + + /* free the device info set handles */ + while (ClassDevInfo != LastClassDevInfo) + { + if (ClassDevInfo->hDevInfo != INVALID_HANDLE_VALUE) + { + SetupDiDestroyDeviceInfoList(ClassDevInfo->hDevInfo); + } + ClassDevInfo->hDevInfo = NULL; + ClassDevInfo->ItemCount = 0; + ClassDevInfo->ImageIndex = 0; + + if (ClassDevInfo->HwDevInfo != NULL) + { + HeapFree(GetProcessHeap(), + 0, + ClassDevInfo->HwDevInfo); + ClassDevInfo->HwDevInfo = NULL; + } + + ClassDevInfo++; + } +} + + static VOID -FillDevicesList(IN PHARDWARE_PAGE_DATA hpd) +BuildDevicesList(IN PHARDWARE_PAGE_DATA hpd) { - PHWCLASSDEVINFO DevInfo, LastDevInfo; + PHWCLASSDEVINFO ClassDevInfo, LastClassDevInfo; SP_DEVINFO_DATA DevInfoData; - WCHAR szBuffer[255]; - INT ItemCount = 0; DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); - DevInfo = hpd->ClassDevInfo; - LastDevInfo = DevInfo + hpd->NumberOfGuids; + ClassDevInfo = hpd->ClassDevInfo; + LastClassDevInfo = ClassDevInfo + hpd->NumberOfGuids; - while (DevInfo != LastDevInfo) + while (ClassDevInfo != LastClassDevInfo) { - INT ImageIndex = -1; - - DevInfo->hDevInfo = SetupDiGetClassDevs(&DevInfo->Guid, - NULL, - hpd->hWnd, - DIGCF_PRESENT); - if (DevInfo->hDevInfo != INVALID_HANDLE_VALUE) + ClassDevInfo->ImageIndex = -1; + ClassDevInfo->hDevInfo = SetupDiGetClassDevs(&ClassDevInfo->Guid, + NULL, + hpd->hWnd, + DIGCF_PRESENT); + if (ClassDevInfo->hDevInfo != INVALID_HANDLE_VALUE) { - LVITEM li; DWORD MemberIndex = 0; SetupDiGetClassImageIndex(&hpd->ClassImageListData, - &DevInfo->Guid, - &ImageIndex); + &ClassDevInfo->Guid, + &ClassDevInfo->ImageIndex); - while (SetupDiEnumDeviceInfo(DevInfo->hDevInfo, + while (SetupDiEnumDeviceInfo(ClassDevInfo->hDevInfo, MemberIndex++, &DevInfoData)) { - DWORD RegDataType; - INT iItem; - - if (DevInfo->HwDevInfo != NULL) + if (ClassDevInfo->HwDevInfo != NULL) { PHWDEVINFO HwNewDevInfo = HeapReAlloc(GetProcessHeap(), 0, - DevInfo->HwDevInfo, - (DevInfo->ItemCount + 1) * + ClassDevInfo->HwDevInfo, + (ClassDevInfo->ItemCount + 1) * sizeof(HWDEVINFO)); if (HwNewDevInfo != NULL) { - DevInfo->HwDevInfo = HwNewDevInfo; + ClassDevInfo->HwDevInfo = HwNewDevInfo; } else { DPRINT1("Unable to allocate memory for %d SP_DEVINFO_DATA structures!\n", - DevInfo->ItemCount + 1); + ClassDevInfo->ItemCount + 1); break; } } else { - DevInfo->HwDevInfo = HeapAlloc(GetProcessHeap(), - 0, - sizeof(HWDEVINFO)); - if (DevInfo->HwDevInfo == NULL) + ClassDevInfo->HwDevInfo = HeapAlloc(GetProcessHeap(), + 0, + sizeof(HWDEVINFO)); + if (ClassDevInfo->HwDevInfo == NULL) { DPRINT1("Unable to allocate memory for a SP_DEVINFO_DATA structures!\n"); break; } } - DevInfo->HwDevInfo[DevInfo->ItemCount].ClassDevInfo = DevInfo; - DevInfo->HwDevInfo[DevInfo->ItemCount++].DevInfoData = DevInfoData; + ClassDevInfo->HwDevInfo[ClassDevInfo->ItemCount].ClassDevInfo = ClassDevInfo; + ClassDevInfo->HwDevInfo[ClassDevInfo->ItemCount++].DevInfoData = DevInfoData; + } + } - if ((SetupDiGetDeviceRegistryProperty(DevInfo->hDevInfo, - &DevInfoData, + ClassDevInfo++; + } +} + + +static VOID +FillDevicesList(IN PHARDWARE_PAGE_DATA hpd) +{ + PHWCLASSDEVINFO ClassDevInfo, LastClassDevInfo; + PHWDEVINFO HwDevInfo, LastHwDevInfo; + WCHAR szBuffer[255]; + INT ItemCount = 0; + + BuildDevicesList(hpd); + + ClassDevInfo = hpd->ClassDevInfo; + LastClassDevInfo = ClassDevInfo + hpd->NumberOfGuids; + + while (ClassDevInfo != LastClassDevInfo) + { + if (ClassDevInfo->HwDevInfo != NULL) + { + HwDevInfo = ClassDevInfo->HwDevInfo; + LastHwDevInfo = HwDevInfo + ClassDevInfo->ItemCount; + + while (HwDevInfo != LastHwDevInfo) + { + DWORD RegDataType; + INT iItem; + LVITEM li; + + if ((SetupDiGetDeviceRegistryProperty(ClassDevInfo->hDevInfo, + &HwDevInfo->DevInfoData, SPDRP_FRIENDLYNAME, &RegDataType, (PBYTE)szBuffer, sizeof(szBuffer), NULL) || - SetupDiGetDeviceRegistryProperty(DevInfo->hDevInfo, - &DevInfoData, + SetupDiGetDeviceRegistryProperty(ClassDevInfo->hDevInfo, + &HwDevInfo->DevInfoData, SPDRP_DEVICEDESC, &RegDataType, (PBYTE)szBuffer, @@ -236,8 +342,8 @@ li.state = (ItemCount == 0 ? LVIS_SELECTED : 0); li.stateMask = LVIS_SELECTED; li.pszText = szBuffer; - li.iImage = ImageIndex; - li.lParam = (LPARAM)&DevInfo->HwDevInfo[DevInfo->ItemCount - 1]; + li.iImage = ClassDevInfo->ImageIndex; + li.lParam = (LPARAM)HwDevInfo; iItem = ListView_InsertItem(hpd->hWndDevList, &li); @@ -245,7 +351,7 @@ { ItemCount++; - if (SetupDiGetClassDescription(&DevInfo->Guid, + if (SetupDiGetClassDescription(&ClassDevInfo->Guid, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]), NULL)) @@ -259,10 +365,12 @@ } } } + + HwDevInfo++; } } - DevInfo++; + ClassDevInfo++; } /* update the controls */ @@ -509,8 +617,6 @@ HWND hBtnTroubleShoot = GetDlgItem(hpd->hWnd, IDC_TROUBLESHOOT); - EnableWindow(hBtnTroubleShoot, - Enable); ShowWindow(hBtnTroubleShoot, Enable ? SW_SHOW : SW_HIDE); } @@ -650,22 +756,9 @@ case WM_DESTROY: { - UINT i; + /* free devices list */ + FreeDevicesList(hpd); - /* free the device info set handles */ - for (i = 0; - i < hpd->NumberOfGuids; - i++) - { - SetupDiDestroyDeviceInfoList(hpd->ClassDevInfo[i].hDevInfo); - if (hpd->ClassDevInfo[i].HwDevInfo != NULL) - { - HeapFree(GetProcessHeap(), - 0, - hpd->ClassDevInfo[i].HwDevInfo); - } - } - /* restore the old window proc of the subclassed parent window */ if (hpd->hWndParent != NULL && hpd->ParentOldWndProc != NULL) {

18 years, 9 months

[gvg] 19591: Sync to Wine-0_9_2:

by gvg＠svn.reactos.com

Sync to Wine-0_9_2: Vincent Béron <vberon(a)mecano.gme.usherb.ca> - Mark some functions as implemented in the spec files. Modified: trunk/reactos/lib/rpcrt4/rpcrt4.spec _____ Modified: trunk/reactos/lib/rpcrt4/rpcrt4.spec --- trunk/reactos/lib/rpcrt4/rpcrt4.spec 2005-11-25 23:14:25 UTC (rev 19590) +++ trunk/reactos/lib/rpcrt4/rpcrt4.spec 2005-11-25 23:16:28 UTC (rev 19591) @@ -247,7 +247,7 @@ @ stdcall NdrInterfacePointerMemorySize(ptr ptr) @ stdcall NdrInterfacePointerUnmarshall(ptr ptr ptr long) @ stub NdrIsAppDoneWithPipes -@ stub NdrMapCommAndFaultStatus +@ stdcall NdrMapCommAndFaultStatus(ptr ptr ptr long) @ stub NdrMarkNextActivePipe @ stub NdrMesProcEncodeDecode2 @ stub NdrMesProcEncodeDecode

18 years, 9 months

[gvg] 19590: Sync to Wine-0_9_2:

by gvg＠svn.reactos.com

Sync to Wine-0_9_2: YunSong Hwang <hys545(a)dreamwiz.com> - Update Korean translations. - Add Korean translations. Modified: trunk/reactos/lib/oledlg/oledlg_Ko.rc _____ Modified: trunk/reactos/lib/oledlg/oledlg_Ko.rc --- trunk/reactos/lib/oledlg/oledlg_Ko.rc 2005-11-25 23:12:29 UTC (rev 19589) +++ trunk/reactos/lib/oledlg/oledlg_Ko.rc 2005-11-25 23:14:25 UTC (rev 19590) @@ -26,30 +26,30 @@ LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "Object Type:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + LTEXT "???? ?©?È:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE DEFPUSHBUTTON "?«??",IDOK,221,7,66,14 PUSHBUTTON "?Ù?Ê",IDCANCEL,221,24,66,14 GROUPBOX "?ß?·",IDC_RESULT,7,103,208,41 CONTROL "?§À? ©©ÁÚ? Ô",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 - CONTROL "Create Control",IDC_CREATECONTROL,"Button", + CONTROL "??ã«ÀÐ ©©ÁÚ?Ô",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 - CONTROL "Create From File",IDC_CREATEFROMFILE,"Button", + CONTROL "ã??¤À????? ©©ÁÚ?Ô",IDC_CREATEFROMFILE,"Button", BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 - PUSHBUTTON "&Add Control...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Display As Icon",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + PUSHBUTTON "??ã«ÀÐ ???í(&A)...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "¥ã?????©À? ?©? Ô",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 - PUSHBUTTON "Browse...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE - LTEXT "File:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + PUSHBUTTON "?ú?Ô...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "ã??¤:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE END STRINGTABLE DISCARDABLE { - IDS_RESULTOBJDESC "Insert a new %s object into your document" - IDS_RESULTFILEOBJDESC "Insert the contents of the file as an object into your document so that you may activate it using the program which created it." - IDS_BROWSE "Browse" - IDS_NOTOLEMOD "File does not appear to be a valid OLE module. Unable to register OLE control." - IDS_NOTOLEMODCAPTION "Add Control" + IDS_RESULTOBJDESC "?§ %s ????©ª ?«?¡?í ??È" + IDS_RESULTFILEOBJDESC "????ÃÐ Ã«?Î©??? ?þ?ÙÃ¤?® ?????¡¢????÷ ? Í?? ????©ª ?«?¡ã??¤ ???Ù?©À? ??ÈÃ¤¢???." + IDS_BROWSE "?ú?Ô" + IDS_NOTOLEMOD "?? ã??¤?? ????©Ñ OLE©ÁÔ?? ¥ã?Ð??À? ?©?È?¤??. OLE??ã«ÀÐ?? Á¯À¤ÃÊ?÷ ¥°¢??¤??." + IDS_NOTOLEMODCAPTION "??ã«ÀÐ ???í" }

18 years, 9 months

[gvg] 19589: Sync to Wine-0_9_2:

by gvg＠svn.reactos.com

Sync to Wine-0_9_2: Francois Gouget <fgouget(a)free.fr> - Remove spaces before '\n' in traces. - Assorted spelling and case fixes. Steven Edwards <winehacker(a)gmail.com> - Partly implement MsiMessageBox[A/W] on top of MessageBoxEx[A/W] YunSong Hwang <hys545(a)dreamwiz.com> - Add Korean translations. - Update Korean translations. Aric Stewart <aric(a)codeweavers.com> - Use MsiDecomposeDescriptorW in MsiProvideQualifiedComponentExW. Mike McCormack <mike(a)codeweavers.com> - Fix comparison of empty properties to numbers and add test cases. - Only return ERROR_MORE_DATA if there's a buffer to copy a result into. - Fix function prototype and spec file entry for MsiEnumComponentQualifiers. - Set the Installed property if the product is already installed. - Loop around calling RegQueryValue until we have a big enough string for both the name and the value. - Convert MsiEnumComponentQualifiers to use msi_strcpy_to_awstring. - Empty strings are not equal to any number, so all comparisons against them fail except for tests for non-equalness. Modified: trunk/reactos/lib/msi/helpers.c Modified: trunk/reactos/lib/msi/msi_Ko.rc Modified: trunk/reactos/lib/msi/registry.c _____ Modified: trunk/reactos/lib/msi/helpers.c --- trunk/reactos/lib/msi/helpers.c 2005-11-25 23:10:34 UTC (rev 19588) +++ trunk/reactos/lib/msi/helpers.c 2005-11-25 23:12:29 UTC (rev 19589) @@ -221,40 +221,42 @@ if (!name) return NULL; - /* special resolving for Target and Source root dir */ - if (strcmpW(name,cszTargetDir)==0 || strcmpW(name,cszSourceDir)==0) + /* source directories appear to always be at the root */ + if (source) { - if (!source) + path = msi_dup_property( package, cszSourceDir ); + if (!path) { - LPWSTR check_path; - check_path = msi_dup_property( package, cszTargetDir ); - if (!check_path) + path = msi_dup_property( package, cszDatabase ); + if (path) { - check_path = msi_dup_property( package, cszRootDrive ); - if (set_prop) - MSI_SetPropertyW(package,cszTargetDir,check_path); + p = strrchrW(path,'\\'); + if (p) + *(p+1) = 0; } - - /* correct misbuilt target dir */ - path = build_directory_name(2, check_path, NULL); - if (strcmpiW(path,check_path)!=0) - MSI_SetPropertyW(package,cszTargetDir,path); - msi_free(check_path); } - else + if (folder) + *folder = get_loaded_folder( package, name ); + return path; + } + + /* special resolving for Target and Source root dir */ + if (strcmpW(name,cszTargetDir)==0 || strcmpW(name,cszSourceDir)==0) + { + LPWSTR check_path; + check_path = msi_dup_property( package, cszTargetDir ); + if (!check_path) { - path = msi_dup_property( package, cszSourceDir ); - if (!path) - { - path = msi_dup_property( package, cszDatabase ); - if (path) - { - p = strrchrW(path,'\\'); - if (p) - *(p+1) = 0; - } - } + check_path = msi_dup_property( package, cszRootDrive ); + if (set_prop) + MSI_SetPropertyW(package,cszTargetDir,check_path); } + + /* correct misbuilt target dir */ + path = build_directory_name(2, check_path, NULL); + if (strcmpiW(path,check_path)!=0) + MSI_SetPropertyW(package,cszTargetDir,path); + msi_free(check_path); if (folder) *folder = get_loaded_folder( package, name ); return path; @@ -267,20 +269,14 @@ if (folder) *folder = f; - if (!source && f->ResolvedTarget) + if (f->ResolvedTarget) { path = strdupW( f->ResolvedTarget ); TRACE(" already resolved to %s\n",debugstr_w(path)); return path; } - else if (source && f->ResolvedSource) + else if (f->Property) { - path = strdupW( f->ResolvedSource ); - TRACE(" (source)already resolved to %s\n",debugstr_w(path)); - return path; - } - else if (!source && f->Property) - { path = build_directory_name( 2, f->Property, NULL ); TRACE(" internally set to %s\n",debugstr_w(path)); @@ -296,25 +292,13 @@ TRACE(" ! Parent is %s\n", debugstr_w(parent)); p = resolve_folder(package, parent, source, set_prop, NULL); - if (!source) - { - TRACE(" TargetDefault = %s\n", debugstr_w(f->TargetDefault)); + TRACE(" TargetDefault = %s\n", debugstr_w(f->TargetDefault)); - path = build_directory_name( 3, p, f->TargetDefault, NULL ); - f->ResolvedTarget = strdupW( path ); - TRACE(" resolved into %s\n",debugstr_w(path)); - if (set_prop) - MSI_SetPropertyW(package,name,path); - } - else - { - if (f->SourceDefault && f->SourceDefault[0]!='.') - path = build_directory_name( 3, p, f->SourceDefault, NULL ); - else - path = strdupW(p); - TRACE(" (source)resolved into %s\n",debugstr_w(path)); - f->ResolvedSource = strdupW( path ); - } + path = build_directory_name( 3, p, f->TargetDefault, NULL ); + f->ResolvedTarget = strdupW( path ); + TRACE(" resolved into %s\n",debugstr_w(path)); + if (set_prop) + MSI_SetPropertyW(package,name,path); msi_free(p); } return path; _____ Modified: trunk/reactos/lib/msi/msi_Ko.rc --- trunk/reactos/lib/msi/msi_Ko.rc 2005-11-25 23:10:34 UTC (rev 19588) +++ trunk/reactos/lib/msi/msi_Ko.rc 2005-11-25 23:12:29 UTC (rev 19589) @@ -22,12 +22,12 @@ STRINGTABLE DISCARDABLE { - 5 "path %s not found" + 5 "%s ?µÀ?©ª ?ú???÷ ¥°¢??¤??" 9 "Á¢??® %s ??È" 10 "?²©°Á? ©????»?÷" - 11 "enter which folder contains %s" - 12 "install source for feature missing" - 13 "network drive for feature missing" - 14 "feature from:" - 15 "choose which folder contains %s" + 11 "%s©ª ã¸ÃÈÃ¤?? ã·?§©ª ?ÈÀ?Ã¤???®" + 12 "?³?° ???ð(feature)?? ?ºÃÐ ???í ?°??" + 13 "?³?° ???ð(feature)?? ?ºÃÐ ?Îã«?÷?® ÁÕÂ¾???Û" + 14 "???ð(feature)?í?¡:" + 15 " %s©ª ã¸ÃÈÃ¤?? ã·?§ ????" } _____ Modified: trunk/reactos/lib/msi/registry.c --- trunk/reactos/lib/msi/registry.c 2005-11-25 23:10:34 UTC (rev 19588) +++ trunk/reactos/lib/msi/registry.c 2005-11-25 23:12:29 UTC (rev 19589) @@ -773,7 +773,7 @@ awstring *lpQualBuf, DWORD* pcchQual, awstring *lpAppBuf, DWORD* pcchAppBuf ) { - DWORD name_sz, val_sz, type, ofs; + DWORD name_sz, val_sz, name_max, val_max, type, ofs; LPWSTR name = NULL, val = NULL; UINT r, r2; HKEY key; @@ -789,41 +789,58 @@ return ERROR_UNKNOWN_COMPONENT; /* figure out how big the name is we want to return */ - name_sz = 0; - if (pcchQual) - { - r = ERROR_OUTOFMEMORY; - name_sz = *pcchQual * 4; - name = msi_alloc( name_sz * sizeof(WCHAR) ); - if (!name) - goto end; - } + name_max = 0x10; + r = ERROR_OUTOFMEMORY; + name = msi_alloc( name_max * sizeof(WCHAR) ); + if (!name) + goto end; - /* figure out how big the value is */ - type = 0; - val_sz = 0; - r = RegEnumValueW( key, iIndex, NULL, NULL, - NULL, &type, NULL, &val_sz ); - if (r != ERROR_SUCCESS) + val_max = 0x10; + r = ERROR_OUTOFMEMORY; + val = msi_alloc( val_max ); + if (!val) goto end; - if (type != REG_MULTI_SZ) + /* loop until we allocate enough memory */ + while (1) { - ERR("component data has wrong type (%ld)\n", type); + name_sz = name_max; + val_sz = val_max; + r = RegEnumValueW( key, iIndex, name, &name_sz, + NULL, &type, (LPBYTE)val, &val_sz ); + if (r == ERROR_SUCCESS) + break; + if (r != ERROR_MORE_DATA) + goto end; + + if (type != REG_MULTI_SZ) + { + ERR("component data has wrong type (%ld)\n", type); + goto end; + } + + r = ERROR_OUTOFMEMORY; + if ((name_sz+1) >= name_max) + { + name_max *= 2; + msi_free( name ); + name = msi_alloc( name_max * sizeof (WCHAR) ); + if (!name) + goto end; + continue; + } + if (val_sz > val_max) + { + val_max = val_sz + sizeof (WCHAR); + val = msi_alloc( val_max * sizeof (WCHAR) ); + if (!val) + goto end; + continue; + } + ERR("should be enough data, but isn't %ld %ld\n", name_sz, val_sz ); goto end; } - /* the value size is in bytes */ - val_sz += sizeof(WCHAR); - val = msi_alloc( val_sz ); - if (!val) - goto end; - - r = RegEnumValueW( key, iIndex, name, &name_sz, - NULL, &type, (LPBYTE)val, &val_sz ); - if (r != ERROR_SUCCESS) - goto end; - ofs = 0; r = MsiDecomposeDescriptorW( val, NULL, NULL, NULL, &ofs ); if (r != ERROR_SUCCESS)

18 years, 9 months

[gvg] 19588: Sync to Wine-0_9_2:

by gvg＠svn.reactos.com

Sync to Wine-0_9_2: Francois Gouget <fgouget(a)free.fr> - Remove spaces before '\n' in traces. Modified: trunk/reactos/lib/dplayx/dplay.c _____ Modified: trunk/reactos/lib/dplayx/dplay.c --- trunk/reactos/lib/dplayx/dplay.c 2005-11-25 23:09:03 UTC (rev 19587) +++ trunk/reactos/lib/dplayx/dplay.c 2005-11-25 23:10:34 UTC (rev 19588) @@ -2664,7 +2664,7 @@ LPDPNAME lpName = (LPDPNAME)lpData; DWORD dwRequiredDataSize; - FIXME( "(%p)->(0x%08lx,%p,%p,%u): ANSI \n", + FIXME( "(%p)->(0x%08lx,%p,%p,%u): ANSI\n", This, idPlayer, lpData, lpdwDataSize, bAnsi ); if( ( lpPList = DP_FindPlayer( This, idPlayer ) ) == NULL )

18 years, 9 months

[gvg] 19587: Sync to Wine-0_9_2:

by gvg＠svn.reactos.com

Sync to Wine-0_9_2: Christoph Frick <frick(a)sc-networks.de> - Moved and adopted joystick_linux.c code into the joystick_linuxinput.c. Francois Gouget <fgouget(a)free.fr> - Remove spaces before '\n' in traces. Daniel Remenak <dtremenak(a)gmail.com> - Add additional sanity checks to the linux input system dinput joystick implementation. Modified: trunk/reactos/lib/dinput/dinput_main.c Modified: trunk/reactos/lib/dinput/effect_linuxinput.c Modified: trunk/reactos/lib/dinput/joystick_linuxinput.c _____ Modified: trunk/reactos/lib/dinput/dinput_main.c --- trunk/reactos/lib/dinput/dinput_main.c 2005-11-25 23:08:16 UTC (rev 19586) +++ trunk/reactos/lib/dinput/dinput_main.c 2005-11-25 23:09:03 UTC (rev 19587) @@ -173,7 +173,7 @@ case DIDEVTYPE_KEYBOARD: return "DIDEVTYPE_KEYBOARD"; case DIDEVTYPE_JOYSTICK: return "DIDEVTYPE_JOYSTICK"; case DIDEVTYPE_DEVICE: return "DIDEVTYPE_DEVICE"; - default: return "Unkown"; + default: return "Unknown"; } } _____ Modified: trunk/reactos/lib/dinput/effect_linuxinput.c --- trunk/reactos/lib/dinput/effect_linuxinput.c 2005-11-25 23:08:16 UTC (rev 19586) +++ trunk/reactos/lib/dinput/effect_linuxinput.c 2005-11-25 23:09:03 UTC (rev 19587) @@ -823,7 +823,7 @@ HeapFree(GetProcessHeap(), 0, newEffect); return DIERR_INVALIDPARAM; default: - FIXME("Unkown force type.\n"); + FIXME("Unknown force type.\n"); HeapFree(GetProcessHeap(), 0, newEffect); return DIERR_INVALIDPARAM; } _____ Modified: trunk/reactos/lib/dinput/joystick_linuxinput.c --- trunk/reactos/lib/dinput/joystick_linuxinput.c 2005-11-25 23:08:16 UTC (rev 19586) +++ trunk/reactos/lib/dinput/joystick_linuxinput.c 2005-11-25 23:09:03 UTC (rev 19587) @@ -637,7 +637,7 @@ return i; } - /* XXX - the following part wont work with LiveForSpeed + /* XXX - the following part won't work with LiveForSpeed * - the game sets the dwTypes to something else then * the ddoi.dwType set in EnumObjects */

18 years, 9 months

[gvg] 19586: Sync to Wine-0_9_2:

by gvg＠svn.reactos.com

Sync to Wine-0_9_2: Juan Lang <juan_lang(a)yahoo.com> - Fix some memory leaks. Modified: trunk/reactos/lib/crypt32/cert.c Modified: trunk/reactos/lib/crypt32/encode.c _____ Modified: trunk/reactos/lib/crypt32/cert.c --- trunk/reactos/lib/crypt32/cert.c 2005-11-25 23:05:28 UTC (rev 19585) +++ trunk/reactos/lib/crypt32/cert.c 2005-11-25 23:08:16 UTC (rev 19586) @@ -347,6 +347,7 @@ memcpy(&ref->cert, context, sizeof(ref->cert)); ref->context = context; InterlockedIncrement(&context->ref); + TRACE("%p's ref count is %ld\n", context, context->ref); ref->cert.hCertStore = store; } @@ -356,6 +357,7 @@ PWINE_CERT_CONTEXT_REF pCertRef = CryptMemAlloc( sizeof(WINE_CERT_CONTEXT_REF)); + TRACE("(%p, %p)\n", context, store); if (pCertRef) CRYPT_InitCertRef(pCertRef, context, store); return pCertRef; @@ -461,6 +463,7 @@ } else ret = FALSE; + TRACE("returning %d\n", ret); return ret; } @@ -483,9 +486,12 @@ if (listNext) { ret = CryptMemAlloc(sizeof(WINE_CERT_LIST_ENTRY)); - memcpy(ret, LIST_ENTRY(listNext, WINE_CERT_LIST_ENTRY, entry), - sizeof(WINE_CERT_LIST_ENTRY)); - InterlockedIncrement(&ret->cert.context->ref); + if (ret) + { + memcpy(ret, LIST_ENTRY(listNext, WINE_CERT_LIST_ENTRY, entry), + sizeof(WINE_CERT_LIST_ENTRY)); + InterlockedIncrement(&ret->cert.context->ref); + } } else { @@ -498,13 +504,15 @@ return (PWINE_CERT_CONTEXT_REF)ret; } +static void CRYPT_UnrefCertificateContext(PWINE_CERT_CONTEXT_REF ref); + static BOOL WINAPI CRYPT_MemDeleteCert(HCERTSTORE hCertStore, PCCERT_CONTEXT pCertContext, DWORD dwFlags) { WINE_MEMSTORE *store = (WINE_MEMSTORE *)hCertStore; WINE_CERT_CONTEXT_REF *ref = (WINE_CERT_CONTEXT_REF *)pCertContext; PWINE_CERT_LIST_ENTRY cert, next; - BOOL ret; + BOOL ret = TRUE; /* Find the entry associated with the passed-in context, since the * passed-in context may not be a list entry itself (e.g. if it came from @@ -522,11 +530,16 @@ * protected. */ list_remove(&cert->entry); + /* FIXME: generally I should do the following, otherwise there is + * a memory leak. But doing so when called by + * CertDeleteCertificateFromStore results in a double free, so + * leaving commented for now. + ret = CertFreeCertificateContext((PCCERT_CONTEXT)cert); + */ cert->entry.prev = cert->entry.next = &store->certs; break; } } - ret = TRUE; LeaveCriticalSection(&store->cs); return ret; } @@ -662,73 +675,41 @@ { PWINE_COLLECTION_CERT_CONTEXT ret; PWINE_CERT_CONTEXT_REF child; + struct list *storeNext = list_next(&store->stores, &storeEntry->entry); TRACE("(%p, %p, %p)\n", store, storeEntry, pPrev); + child = storeEntry->store->enumCert((HCERTSTORE)storeEntry->store, + pPrev ? pPrev->childContext : NULL); if (pPrev) { - child = storeEntry->store->enumCert((HCERTSTORE)storeEntry->store, - pPrev->childContext); - if (child) + pPrev->childContext = NULL; + CertFreeCertificateContext((PCCERT_CONTEXT)pPrev); + pPrev = NULL; + } + if (child) + { + ret = (PWINE_COLLECTION_CERT_CONTEXT)CRYPT_CollectionCreateCertRef( + child->context, store); + if (ret) { - ret = pPrev; - memcpy(&ret->cert, child, sizeof(WINE_CERT_CONTEXT_REF)); - ret->cert.cert.hCertStore = (HCERTSTORE)store; - InterlockedIncrement(&ret->cert.context->ref); + ret->entry = storeEntry; ret->childContext = child; } else - { - struct list *storeNext = list_next(&store->stores, - &storeEntry->entry); - - pPrev->childContext = NULL; - CertFreeCertificateContext((PCCERT_CONTEXT)pPrev); - if (storeNext) - { - storeEntry = LIST_ENTRY(storeNext, WINE_STORE_LIST_ENTRY, - entry); - ret = CRYPT_CollectionAdvanceEnum(store, storeEntry, NULL); - } - else - { - SetLastError(CRYPT_E_NOT_FOUND); - ret = NULL; - } - } + CertFreeCertificateContext((PCCERT_CONTEXT)child); } else { - child = storeEntry->store->enumCert((HCERTSTORE)storeEntry->store, - NULL); - if (child) + if (storeNext) { - ret = (PWINE_COLLECTION_CERT_CONTEXT)CRYPT_CollectionCreateCertRef( - child->context, store); - if (ret) - { - ret->entry = storeEntry; - ret->childContext = child; - } - else - CertFreeCertificateContext((PCCERT_CONTEXT)child); + storeEntry = LIST_ENTRY(storeNext, WINE_STORE_LIST_ENTRY, entry); + ret = CRYPT_CollectionAdvanceEnum(store, storeEntry, NULL); } else { - struct list *storeNext = list_next(&store->stores, - &storeEntry->entry); - - if (storeNext) - { - storeEntry = LIST_ENTRY(storeNext, WINE_STORE_LIST_ENTRY, - entry); - ret = CRYPT_CollectionAdvanceEnum(store, storeEntry, NULL); - } - else - { - SetLastError(CRYPT_E_NOT_FOUND); - ret = NULL; - } + SetLastError(CRYPT_E_NOT_FOUND); + ret = NULL; } } TRACE("returning %p\n", ret); @@ -923,11 +904,9 @@ CERT_STORE_ADD_REPLACE_EXISTING, NULL); } else - { TRACE("hash doesn't match, ignoring\n"); - contextInterface->free(context); - } } + contextInterface->free(context); } } } @@ -1139,8 +1118,7 @@ static PWINE_CERT_CONTEXT_REF CRYPT_RegCreateCertRef( PWINE_CERT_CONTEXT context, HCERTSTORE store) { - PWINE_REG_CERT_CONTEXT ret = CryptMemAlloc( - sizeof(WINE_REG_CERT_CONTEXT)); + PWINE_REG_CERT_CONTEXT ret = CryptMemAlloc(sizeof(WINE_REG_CERT_CONTEXT)); if (ret) { @@ -1159,33 +1137,22 @@ TRACE("(%p, %p)\n", store, pPrev); - if (pPrev) + child = rs->memStore->enumCert(rs->memStore, prev ? prev->childContext + : NULL); + if (prev) { - child = rs->memStore->enumCert(rs->memStore, prev->childContext); - if (child) - { - ret = (PWINE_REG_CERT_CONTEXT)pPrev; - memcpy(&ret->cert, child, sizeof(WINE_CERT_CONTEXT_REF)); - ret->cert.cert.hCertStore = (HCERTSTORE)store; - ret->childContext = child; - } + prev->childContext = NULL; + CertFreeCertificateContext((PCCERT_CONTEXT)prev); + prev = NULL; } - else + if (child) { - child = rs->memStore->enumCert(rs->memStore, NULL); - if (child) - { - ret = CryptMemAlloc(sizeof(WINE_REG_CERT_CONTEXT)); - - if (ret) - { - memcpy(&ret->cert, child, sizeof(WINE_CERT_CONTEXT_REF)); - ret->cert.cert.hCertStore = (HCERTSTORE)store; - ret->childContext = child; - } - else - CertFreeCertificateContext((PCCERT_CONTEXT)child); - } + ret = (PWINE_REG_CERT_CONTEXT)CRYPT_RegCreateCertRef(child->context, + store); + if (ret) + ret->childContext = child; + else + CertFreeCertificateContext((PCCERT_CONTEXT)child); } return (PWINE_CERT_CONTEXT_REF)ret; } @@ -2349,7 +2316,8 @@ else { ret = hcs->deleteCert(hcs, pCertContext, 0); - CertFreeCertificateContext(pCertContext); + if (ret) + CertFreeCertificateContext(pCertContext); } } return ret; @@ -2884,6 +2852,17 @@ return ret; } +static void CRYPT_UnrefCertificateContext(PWINE_CERT_CONTEXT_REF ref) +{ + if (InterlockedDecrement(&ref->context->ref) == 0) + { + TRACE("%p's ref count is 0, freeing\n", ref->context); + CRYPT_FreeCert(ref->context); + } + else + TRACE("%p's ref count is %ld\n", ref->context, ref->context->ref); +} + BOOL WINAPI CertFreeCertificateContext(PCCERT_CONTEXT pCertContext) { TRACE("(%p)\n", pCertContext); @@ -2893,16 +2872,11 @@ PWINE_CERT_CONTEXT_REF ref = (PWINE_CERT_CONTEXT_REF)pCertContext; PWINECRYPT_CERTSTORE store = (PWINECRYPT_CERTSTORE)ref->cert.hCertStore; - if (InterlockedDecrement(&ref->context->ref) == 0) - { - TRACE("%p's ref count is 0, freeing\n", ref->context); - CRYPT_FreeCert(ref->context); - } - else - TRACE("%p's ref count is %ld\n", ref->context, ref->context->ref); + CRYPT_UnrefCertificateContext(ref); if (store && store->dwMagic == WINE_CRYPTCERTSTORE_MAGIC && store->freeCert) store->freeCert(ref); + TRACE("freeing %p\n", ref); CryptMemFree(ref); } return TRUE; _____ Modified: trunk/reactos/lib/crypt32/encode.c --- trunk/reactos/lib/crypt32/encode.c 2005-11-25 23:05:28 UTC (rev 19585) +++ trunk/reactos/lib/crypt32/encode.c 2005-11-25 23:08:16 UTC (rev 19586) @@ -46,6 +46,7 @@ #include "snmp.h" #include "wine/debug.h" #include "wine/exception.h" +#include "crypt32_private.h" /* This is a bit arbitrary, but to set some limit: */ #define MAX_ENCODED_LEN 0x02000000 @@ -1392,7 +1393,7 @@ __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); - return FALSE; + ret = FALSE; } __ENDTRY CryptMemFree(blobs);

18 years, 9 months

[gvg] 19585: Sync to Wine-0_9_2:

by gvg＠svn.reactos.com

Sync to Wine-0_9_2: Vitaliy Margolen <wine-patch(a)kievinfo.com> - Return false if index is out of bounds in GetItemT. Francois Gouget <fgouget(a)free.fr> - Remove spaces before '\n' in traces. - Assorted spelling and case fixes. Thomas Weidenmueller <wine-patches(a)reactsoft.com> - Improved word wrapping and tab key handling. Raphael Junqueira <fenix(a)club-internet.fr> - Implement implement header callback support (HDN_GETDISPINFO notification): - better factorisation - unicode fixes YunSong Hwang <hys545(a)dreamwiz.com> - Update Korean translations. Markus Amsler <markus.amsler(a)oribi.org> - Reformat "see" section, to match c2man requirements. Modified: trunk/reactos/lib/comctl32/comctl_Ko.rc Modified: trunk/reactos/lib/comctl32/header.c Modified: trunk/reactos/lib/comctl32/rebar.c Modified: trunk/reactos/lib/comctl32/syslink.c Modified: trunk/reactos/lib/comctl32/tooltips.c _____ Modified: trunk/reactos/lib/comctl32/comctl_Ko.rc --- trunk/reactos/lib/comctl32/comctl_Ko.rc 2005-11-25 23:01:01 UTC (rev 19584) +++ trunk/reactos/lib/comctl32/comctl_Ko.rc 2005-11-25 23:05:28 UTC (rev 19585) @@ -1,5 +1,6 @@ /* * Copyright 2002 Won-kyu Park <wkpark(a)kldp.org> + * 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 @@ -20,20 +21,20 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Properties for " +CAPTION "?Ë??" 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 + CONTROL "?Ã", 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" +CAPTION "©Â?²?þ" FONT 9, "MS Shell Dlg" BEGIN PUSHBUTTON "< ???³(&B)", IDC_BACK_BUTTON,71,138,50,14 @@ -42,26 +43,26 @@ 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 + CONTROL "?Ã", 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" +CAPTION "ÁÁ?©?? ?þ?Ù?? ?ñ?Ã" 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 + PUSHBUTTON "?ºÀ? ??Á?(&U)", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "¥ãÀíÀ? ??Á?(&D)", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "?í??ÃÐ ?÷ã?(&v)", -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 + PUSHBUTTON "?§Ã¤?Ô(&A) ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- ?ª??Ã¤?Ô(&R)", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "ÁÁ?©?? ?÷ã?(&T):", -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 @@ -73,10 +74,10 @@ STRINGTABLE DISCARDABLE { IDM_TODAY "????:" - IDM_GOTODAY "Go to today" + IDM_GOTODAY "????À? ?í?Ô" } STRINGTABLE DISCARDABLE { - IDS_SEPARATOR "Separator" + IDS_SEPARATOR "?ð©«??" } _____ Modified: trunk/reactos/lib/comctl32/header.c --- trunk/reactos/lib/comctl32/header.c 2005-11-25 23:01:01 UTC (rev 19584) +++ trunk/reactos/lib/comctl32/header.c 2005-11-25 23:05:28 UTC (rev 19585) @@ -813,12 +813,11 @@ if (phdi->mask == 0) return TRUE; - if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem)) - lpItem = NULL; - else - lpItem = &infoPtr->items[nItem]; + return FALSE; + lpItem = &infoPtr->items[nItem]; + if (phdi->mask & HDI_BITMAP) phdi->hbm = (lpItem != NULL) ? lpItem->hbm : 0; _____ Modified: trunk/reactos/lib/comctl32/rebar.c --- trunk/reactos/lib/comctl32/rebar.c 2005-11-25 23:01:01 UTC (rev 19584) +++ trunk/reactos/lib/comctl32/rebar.c 2005-11-25 23:05:28 UTC (rev 19585) @@ -2131,9 +2131,9 @@ lpBand->hwndChild = lprbbi->hwndChild; lpBand->hwndPrevParent = SetParent (lpBand->hwndChild, hwnd); - /* below in trace fro WinRAR */ + /* below in trace from WinRAR */ ShowWindow(lpBand->hwndChild, SW_SHOWNOACTIVATE | SW_SHOWNORMAL); - /* above in trace fro WinRAR */ + /* above in trace from WinRAR */ } else { TRACE("child: %p prev parent: %p\n", _____ Modified: trunk/reactos/lib/comctl32/syslink.c --- trunk/reactos/lib/comctl32/syslink.c 2005-11-25 23:01:01 UTC (rev 19584) +++ trunk/reactos/lib/comctl32/syslink.c 2005-11-25 23:05:28 UTC (rev 19585) @@ -1,7 +1,7 @@ /* * SysLink control * - * Copyright 2004 Thomas Weidenmueller <w3seek(a)reactos.com> + * Copyright 2004, 2005 Thomas Weidenmueller <w3seek(a)reactos.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,12 +25,6 @@ * Unless otherwise noted, we believe this code to be complete, as per * the specification mentioned above. * If you discover missing features, or bugs, please note them below. - * - * TODO: - * - Fix SHIFT+TAB and TAB issue (wrong link is selected when control gets the focus) - * - Better string parsing - * - Improve word wrapping - * */ #include <stdarg.h> @@ -52,6 +46,7 @@ typedef struct { int nChars; + int nSkip; RECT rc; } DOC_TEXTBLOCK, *PDOC_TEXTBLOCK; @@ -78,7 +73,6 @@ UINT state; /* Link state */ WCHAR *szID; /* Link ID string */ WCHAR *szUrl; /* Link URL string */ - HRGN hRgn; /* Region of the link */ } Link; struct { @@ -100,6 +94,7 @@ COLORREF TextColor; /* Color of the text */ COLORREF LinkColor; /* Color of links */ COLORREF VisitedColor; /* Color of visited links */ + WCHAR BreakChar; /* Break Character for the current font */ } SYSLINK_INFO; static const WCHAR SL_LINKOPEN[] = { '<','a', 0 }; @@ -126,11 +121,6 @@ Free(DocItem->u.Link.szUrl); } - if(DocItem->Type == slLink && DocItem->u.Link.hRgn != NULL) - { - DeleteObject(DocItem->u.Link.hRgn); - } - /* we don't free Text because it's just a pointer to a character in the entire window text string */ @@ -215,9 +205,8 @@ { BOOL ValidParam = FALSE, ValidLink = FALSE; - switch (*(current + 2)) + if(*(current + 2) == '>') { - case '>': /* we just have to deal with a <a> tag */ taglen = 3; ValidLink = TRUE; @@ -226,8 +215,8 @@ linklen = 0; lpID = NULL; lpUrl = NULL; - break; - case ' ': + } + else if(*(current + 2) == infoPtr->BreakChar) { /* we expect parameters, parse them */ LPCWSTR *CurrentParameter = NULL, tmp; @@ -285,28 +274,23 @@ * 1. another parameter is coming, so expect a ' ' (space) character * 2. the tag is being closed, so expect a '<' character */ - switch(*tmp) + if(*tmp == infoPtr->BreakChar) { - case ' ': /* we expect another parameter, do the whole thing again */ taglen++; tmp++; goto CheckParameter; - - case '>': + } + else if(*tmp == '>') + { /* the tag is being closed, we're done */ ValidLink = TRUE; taglen++; - break; - default: + } + else tmp++; - break; - } } - - break; } - } if(ValidLink && ValidParam) { @@ -495,16 +479,26 @@ */ static VOID SYSLINK_RepaintLink (SYSLINK_INFO *infoPtr, PDOC_ITEM DocItem) { + PDOC_TEXTBLOCK bl; + int n; + if(DocItem->Type != slLink) { ERR("DocItem not a link!\n"); return; } - if(DocItem->u.Link.hRgn != NULL) + bl = DocItem->Blocks; + if (bl != NULL) { - /* repaint the region */ - RedrawWindow(infoPtr->Self, NULL, DocItem->u.Link.hRgn, RDW_INVALIDATE | RDW_UPDATENOW); + n = DocItem->nText; + + while(n > 0) + { + InvalidateRect(infoPtr->Self, &bl->rc, TRUE); + n -= bl->nChars + bl->nSkip; + bl++; + } } } @@ -615,7 +609,8 @@ * SYSLINK_WrapLine * Tries to wrap a line. */ -static BOOL SYSLINK_WrapLine (HDC hdc, LPWSTR Text, WCHAR BreakChar, int *LineLen, int nFit, LPSIZE Extent, int Width) +static BOOL SYSLINK_WrapLine (HDC hdc, LPWSTR Text, WCHAR BreakChar, int *LineLen, + int nFit, LPSIZE Extent, int Width) { WCHAR *Current; @@ -659,7 +654,6 @@ PDOC_ITEM Current; HGDIOBJ hOldFont; int x, y, LineHeight; - TEXTMETRICW tm; GetClientRect(infoPtr->Self, &rc); rc.right -= SL_RIGHTMARGIN; @@ -668,7 +662,6 @@ if(rc.right - SL_LEFTMARGIN < 0 || rc.bottom - SL_TOPMARGIN < 0) return; hOldFont = SelectObject(hdc, infoPtr->Font); - GetTextMetricsW(hdc, &tm); x = SL_LEFTMARGIN; y = SL_TOPMARGIN; @@ -684,13 +677,18 @@ if(Current->nText == 0) { - ERR("DOC_ITEM with no text?!\n"); continue; } tx = Current->Text; n = Current->nText; - bl = Current->Blocks; + + if (Current->Blocks != NULL) + { + Free(Current->Blocks); + Current->Blocks = NULL; + } + bl = NULL; nBlocks = 0; if(Current->Type == slText) @@ -704,41 +702,80 @@ while(n > 0) { - if(GetTextExtentExPointW(hdc, tx, n, rc.right - x, &nFit, NULL, &szDim)) + int SkipChars = 0; + + /* skip break characters unless they're the first of the doc item */ + if(tx != Current->Text || x == SL_LEFTMARGIN) { + while(n > 0 && (*tx) == infoPtr->BreakChar) + { + tx++; + SkipChars++; + n--; + } + } + + if((n == 0 && SkipChars != 0) || + GetTextExtentExPointW(hdc, tx, n, rc.right - x, &nFit, NULL, &szDim)) + { int LineLen = n; - BOOL Wrap = SYSLINK_WrapLine(hdc, tx, tm.tmBreakChar, &LineLen, nFit, &szDim, rc.right - x); + BOOL Wrap = FALSE; - if(LineLen == 0) + if(n != 0) { - if(x > SL_LEFTMARGIN) + Wrap = SYSLINK_WrapLine(hdc, tx, infoPtr->BreakChar, &LineLen, nFit, &szDim, rc.right - x); + + if(LineLen == 0) { - /* move one line down, the word didn't fit into the line */ - x = SL_LEFTMARGIN; - y += LineHeight; - LineHeight = 0; - continue; + if(x > SL_LEFTMARGIN) + { + /* move one line down, the word didn't fit into the line */ + x = SL_LEFTMARGIN; + y += LineHeight; + LineHeight = 0; + continue; + } + else + { + /* the word starts at the beginning of the line and doesn't + fit into the line, so break it at the last character that fits */ + LineLen = max(nFit, 1); + } } - else + + if(LineLen != n) { - /* the word starts at the beginning of the line and doesn't - fit into the line, so break it at the last character that fits */ - LineLen = max(nFit, 1); + if(!GetTextExtentExPointW(hdc, tx, LineLen, rc.right - x, NULL, NULL, &szDim)) + { + if(bl != NULL) + { + Free(bl); + bl = NULL; + } + break; + } } } - if(LineLen != n) - { - GetTextExtentExPointW(hdc, tx, LineLen, rc.right - x, NULL, NULL, &szDim); - } - if(bl != NULL) { - bl = ReAlloc(bl, ++nBlocks * sizeof(DOC_TEXTBLOCK)); + PDOC_TEXTBLOCK nbl = ReAlloc(bl, (nBlocks + 1) * sizeof(DOC_TEXTBLOCK)); + if (nbl != NULL) + { + bl = nbl; + nBlocks++; + } + else + { + Free(bl); + bl = NULL; + } } else { - bl = Alloc(++nBlocks * sizeof(DOC_TEXTBLOCK)); + bl = Alloc((nBlocks + 1) * sizeof(DOC_TEXTBLOCK)); + if (bl != NULL) + nBlocks++; } if(bl != NULL) @@ -746,42 +783,24 @@ cbl = bl + nBlocks - 1; cbl->nChars = LineLen; + cbl->nSkip = SkipChars; cbl->rc.left = x; cbl->rc.top = y; cbl->rc.right = x + szDim.cx; cbl->rc.bottom = y + szDim.cy; - x += szDim.cx; - LineHeight = max(LineHeight, szDim.cy); - - /* (re)calculate the link's region */ - if(Current->Type == slLink) + if(LineLen != 0) { - if(nBlocks <= 1) + x += szDim.cx; + LineHeight = max(LineHeight, szDim.cy); + + if(Wrap) { - if(Current->u.Link.hRgn != NULL) - { - DeleteObject(Current->u.Link.hRgn); - } - /* initialize the link's hRgn */ - Current->u.Link.hRgn = CreateRectRgnIndirect(&cbl->rc); + x = SL_LEFTMARGIN; + y += LineHeight; + LineHeight = 0; } - else if(Current->u.Link.hRgn != NULL) - { - HRGN hrgn; - hrgn = CreateRectRgnIndirect(&cbl->rc); - /* add the rectangle */ - CombineRgn(Current->u.Link.hRgn, Current->u.Link.hRgn, hrgn, RGN_OR); - DeleteObject(hrgn); - } } - - if(Wrap) - { - x = SL_LEFTMARGIN; - y += LineHeight; - LineHeight = 0; - } } else { @@ -793,11 +812,16 @@ } else { - ERR("GetTextExtentExPoint() failed?!\n"); n--; } } - Current->Blocks = bl; + + if(nBlocks != 0) + { + Current->Blocks = bl; + } + else + Current->Blocks = NULL; } SelectObject(hdc, hOldFont); @@ -849,6 +873,7 @@ while(n > 0) { + tx += bl->nSkip; ExtTextOutW(hdc, bl->rc.left, bl->rc.top, ETO_OPAQUE | ETO_CLIPPED, &bl->rc, tx, bl->nChars, NULL); if((Current->Type == slLink) && (Current->u.Link.state & LIS_FOCUSED) && infoPtr->HasFocus) { @@ -858,7 +883,7 @@ SetBkColor(hdc, PrevColor); } tx += bl->nChars; - n -= bl->nChars; + n -= bl->nChars + bl->nSkip; bl++; } } @@ -896,6 +921,7 @@ { HDC hdc; LOGFONTW lf; + TEXTMETRICW tm; HFONT hOldFont = infoPtr->Font; infoPtr->Font = hFont; @@ -911,10 +937,12 @@ if(hdc != NULL) { /* create a new underline font */ - if(GetObjectW(infoPtr->Font, sizeof(LOGFONTW), &lf)) + if(GetTextMetricsW(hdc, &tm) && + GetObjectW(infoPtr->Font, sizeof(LOGFONTW), &lf)) { lf.lfUnderline = TRUE; infoPtr->LinkFont = CreateFontIndirectW(&lf); + infoPtr->BreakChar = tm.tmBreakChar; } else { @@ -1133,6 +1161,34 @@ } /*********************************************************************** + * SYSLINK_PtInDocItem + * Determines if a point is in the region of a document item + */ +static BOOL SYSLINK_PtInDocItem (PDOC_ITEM DocItem, POINT pt) +{ + PDOC_TEXTBLOCK bl; + int n; + + bl = DocItem->Blocks; + if (bl != NULL) + { + n = DocItem->nText; + + while(n > 0) + { + if (PtInRect(&bl->rc, pt)) + { + return TRUE; + } + n -= bl->nChars + bl->nSkip; + bl++; + } + } + + return FALSE; +} + +/********************************************************************** * * SYSLINK_HitTest * Determines the link the user clicked on. */ @@ -1145,8 +1201,7 @@ { if(Current->Type == slLink) { - if((Current->u.Link.hRgn != NULL) && - PtInRegion(Current->u.Link.hRgn, HitTest->pt.x, HitTest->pt.y)) + if(SYSLINK_PtInDocItem(Current, HitTest->pt)) { HitTest->item.mask = 0; HitTest->item.iLink = id; @@ -1252,25 +1307,13 @@ infoPtr->HasFocus = TRUE; -#if 1 - /* FIXME - How to detect whether SHIFT+TAB or just TAB has been pressed? - * The problem is we could get this message without keyboard input, too - */ - Focus = SYSLINK_GetFocusLink(infoPtr, NULL); - - if(Focus == NULL && (Focus = SYSLINK_GetNextLink(infoPtr, NULL))) - { - SYSLINK_SetFocusLink(infoPtr, Focus); - } -#else - /* This is a temporary hack since I'm not really sure how to detect which link to select. - See message above! */ + /* We always select the first link, even if we activated the control using + SHIFT+TAB. This is the default behavior */ Focus = SYSLINK_GetNextLink(infoPtr, NULL); if(Focus != NULL) { SYSLINK_SetFocusLink(infoPtr, Focus); } -#endif SYSLINK_RepaintLink(infoPtr, Focus); @@ -1307,8 +1350,7 @@ for(Current = infoPtr->Items; Current != NULL; Current = Current->Next) { - if((Current->Type == slLink) && (Current->u.Link.hRgn != NULL) && - PtInRegion(Current->u.Link.hRgn, pt->x, pt->y) && + if((Current->Type == slLink) && SYSLINK_PtInDocItem(Current, *pt) && (!MustBeEnabled || (MustBeEnabled && (Current->u.Link.state & LIS_ENABLED)))) { if(LinkId != NULL) @@ -1335,6 +1377,8 @@ Current = SYSLINK_LinkAtPt(infoPtr, pt, &id, TRUE); if(Current != NULL) { + SetFocus(infoPtr->Self); + Old = SYSLINK_SetFocusLink(infoPtr, Current); if(Old != NULL && Old != Current) { @@ -1342,7 +1386,6 @@ } infoPtr->MouseDownID = id; SYSLINK_RepaintLink(infoPtr, Current); - SetFocus(infoPtr->Self); } return 0; @@ -1460,7 +1503,7 @@ infoPtr = (SYSLINK_INFO *)GetWindowLongPtrW(hwnd, 0); if (!infoPtr && message != WM_CREATE) - return DefWindowProcW( hwnd, message, wParam, lParam ); + goto HandleDefaultMessage; switch(message) { case WM_PRINTCLIENT: @@ -1482,8 +1525,7 @@ return TRUE; } /* let the default window proc handle this message */ - return DefWindowProcW(hwnd, message, wParam, lParam); - + goto HandleDefaultMessage; } case WM_SIZE: @@ -1505,7 +1547,7 @@ case WM_SETTEXT: SYSLINK_SetText(infoPtr, (LPWSTR)lParam); - return DefWindowProcW(hwnd, message, wParam, lParam); + goto HandleDefaultMessage; case WM_LBUTTONDOWN: { @@ -1536,7 +1578,7 @@ return 0; } } - return DefWindowProcW(hwnd, message, wParam, lParam); + goto HandleDefaultMessage; } case WM_GETDLGCODE: @@ -1638,6 +1680,7 @@ infoPtr->TextColor = GetSysColor(COLOR_WINDOWTEXT); infoPtr->LinkColor = GetSysColor(COLOR_HIGHLIGHT); infoPtr->VisitedColor = GetSysColor(COLOR_HIGHLIGHT); + infoPtr->BreakChar = ' '; TRACE("SysLink Ctrl creation, hwnd=%p\n", hwnd); SYSLINK_SetText(infoPtr, ((LPCREATESTRUCTW)lParam)->lpszName); return 0; @@ -1652,8 +1695,11 @@ return 0; default: +HandleDefaultMessage: if ((message >= WM_USER) && (message < WM_APP)) - ERR("unknown msg %04x wp=%04x lp=%08lx\n", message, wParam, lParam ); + { + ERR("unknown msg %04x wp=%04x lp=%08lx\n", message, wParam, lParam ); + } return DefWindowProcW(hwnd, message, wParam, lParam); } } _____ Modified: trunk/reactos/lib/comctl32/tooltips.c --- trunk/reactos/lib/comctl32/tooltips.c 2005-11-25 23:01:01 UTC (rev 19584) +++ trunk/reactos/lib/comctl32/tooltips.c 2005-11-25 23:05:28 UTC (rev 19585) @@ -1507,7 +1507,7 @@ /* NB this API is broken, there is no way for the app to determine what size buffer it requires nor a way to specify how long the - one it supplies is. We'll assume it's upto INFOTIPSIZE */ + one it supplies is. We'll assume it's up to INFOTIPSIZE */ WideCharToMultiByte(CP_ACP, 0, infoPtr->tools[nTool].lpszText, -1, lpToolInfo->lpszText, INFOTIPSIZE, NULL, NULL);

18 years, 9 months

[gvg] 19584: Sync to Wine-0_9_2:

by gvg＠svn.reactos.com

Sync to Wine-0_9_2: YunSong Hwang <hys545(a)dreamwiz.com> - Update Korean translations. - Add Korean translations. Added: trunk/reactos/lib/avifil32/avifile_Ko.rc Modified: trunk/reactos/lib/avifil32/rsrc.rc _____ Copied: trunk/reactos/lib/avifil32/avifile_Ko.rc (from rev 19583, vendor/wine/dlls/avifil32/current/avifile_Ko.rc) Property changes on: trunk/reactos/lib/avifil32/avifile_Ko.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/avifil32/rsrc.rc --- trunk/reactos/lib/avifil32/rsrc.rc 2005-11-25 22:59:48 UTC (rev 19583) +++ trunk/reactos/lib/avifil32/rsrc.rc 2005-11-25 23:01:01 UTC (rev 19584) @@ -45,6 +45,7 @@ #include "avifile_Fr.rc" #include "avifile_It.rc" #include "avifile_Ja.rc" +#include "avifile_Ko.rc" #include "avifile_Nl.rc" #include "avifile_No.rc" #include "avifile_Pl.rc"

18 years, 9 months

[gvg] 19583: Sync to Wine-0_9_2:

by gvg＠svn.reactos.com

Sync to Wine-0_9_2: Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Modified: trunk/reactos/tools/wrc/translation.c _____ Modified: trunk/reactos/tools/wrc/translation.c --- trunk/reactos/tools/wrc/translation.c 2005-11-25 22:55:40 UTC (rev 19582) +++ trunk/reactos/tools/wrc/translation.c 2005-11-25 22:59:48 UTC (rev 19583) @@ -205,7 +205,7 @@ PRETTYPRINTLANG(CORNISH) PRETTYPRINTLANG(WELSH) PRETTYPRINTLANG(BRETON) - return "Unkown language"; + return "Unknown language"; } #endif @@ -981,7 +981,7 @@ add_resource(next); break; default: - fprintf(stderr, "Report this: unkown resource type parsed %08x\n", next->type); + fprintf(stderr, "Report this: unknown resource type parsed %08x\n", next->type); } next = next->next; }

18 years, 9 months

← Newer
1
...
18
19
20
21
22
23
24
...
88
Older →

Jump to page:

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