Ros-dev

ros-dev@reactos.org

5788 discussions

Re: [ros-dev] [ros-diffs] [jimtabor] 38518: - Removed SEH abuse and add notes for the hook code, in NtUserDefSetText. - Update NtUserCallHwndLock subfunctions.

by Timo Kreuzer

SEH is still needed. SafeText doesn't really deserve it's name, as it's only a safe copy of the UNICODE_STRING structure returned by ProbeForReadUnicodeString(), but with the still unsafe string buffer. Also the Buffer was never probed (ProbeForReadUnicodeString only checks the UNICODE_STRING and copies it) IMO the function is dangerous, as it implies that the Buffer was probed, too. Timo jimtabor(a)svn.reactos.org schrieb: > Author: jimtabor > Date: Fri Jan 2 22:02:54 2009 > New Revision: 38518 > > URL: http://svn.reactos.org/svn/reactos?rev=38518&view=rev > Log: > - Removed SEH abuse and add notes for the hook code, in NtUserDefSetText. > - Update NtUserCallHwndLock subfunctions. > > Modified: > trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c > trunk/reactos/subsystems/win32/win32k/ntuser/window.c > > ... > > Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) > +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Fri Jan 2 22:02:54 2009 > @@ -4569,57 +4569,47 @@ > } > Wnd = Window->Wnd; > > - if(SafeText.Length != 0) > - { > - _SEH2_TRY > - { > - if (Wnd->WindowName.MaximumLength > 0 && > - SafeText.Length <= Wnd->WindowName.MaximumLength - sizeof(UNICODE_NULL)) > - { > - ASSERT(Wnd->WindowName.Buffer != NULL); > - > - Wnd->WindowName.Length = SafeText.Length; > - Wnd->WindowName.Buffer[SafeText.Length / sizeof(WCHAR)] = L'\0'; > - RtlCopyMemory(Wnd->WindowName.Buffer, > - SafeText.Buffer, > - SafeText.Length); > - } > - else > - { > - PWCHAR buf; > - Wnd->WindowName.MaximumLength = Wnd->WindowName.Length = 0; > - buf = Wnd->WindowName.Buffer; > - Wnd->WindowName.Buffer = NULL; > - if (buf != NULL) > - { > - DesktopHeapFree(Wnd->pdesktop, > - buf); > - } > - > - Wnd->WindowName.Buffer = DesktopHeapAlloc(Wnd->pdesktop, > - SafeText.Length + sizeof(UNICODE_NULL)); > - if (Wnd->WindowName.Buffer != NULL) > - { > - Wnd->WindowName.Buffer[SafeText.Length / sizeof(WCHAR)] = L'\0'; > - RtlCopyMemory(Wnd->WindowName.Buffer, > - SafeText.Buffer, > - SafeText.Length); > - Wnd->WindowName.MaximumLength = SafeText.Length + sizeof(UNICODE_NULL); > - Wnd->WindowName.Length = SafeText.Length; > - } > - else > - { > - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); > - Ret = FALSE; > - } > - } > - } > - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) > - { > - SetLastNtError(_SEH2_GetExceptionCode()); > - Ret = FALSE; > - } > - _SEH2_END; > + if (SafeText.Length != 0) > + { > + if (Wnd->WindowName.MaximumLength > 0 && > + SafeText.Length <= Wnd->WindowName.MaximumLength - sizeof(UNICODE_NULL)) > + { > + ASSERT(Wnd->WindowName.Buffer != NULL); > + > + Wnd->WindowName.Length = SafeText.Length; > + Wnd->WindowName.Buffer[SafeText.Length / sizeof(WCHAR)] = L'\0'; > + RtlCopyMemory(Wnd->WindowName.Buffer, > + SafeText.Buffer, > + SafeText.Length); > + } > + else > + { > + PWCHAR buf; > + Wnd->WindowName.MaximumLength = Wnd->WindowName.Length = 0; > + buf = Wnd->WindowName.Buffer; > + Wnd->WindowName.Buffer = NULL; > + if (buf != NULL) > + { > + DesktopHeapFree(Wnd->pdesktop, buf); > + } > + > + Wnd->WindowName.Buffer = DesktopHeapAlloc(Wnd->pdesktop, > + SafeText.Length + sizeof(UNICODE_NULL)); > + if (Wnd->WindowName.Buffer != NULL) > + { > + Wnd->WindowName.Buffer[SafeText.Length / sizeof(WCHAR)] = L'\0'; > + RtlCopyMemory(Wnd->WindowName.Buffer, > + SafeText.Buffer, > + SafeText.Length); > + Wnd->WindowName.MaximumLength = SafeText.Length + sizeof(UNICODE_NULL); > + Wnd->WindowName.Length = SafeText.Length; > + } > + else > + { > + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); > + Ret = FALSE; > + } > + } > } > else > { > @@ -4628,6 +4618,9 @@ > Wnd->WindowName.Buffer[0] = L'\0'; > } > > + // HAX! FIXME! Windows does not do this in here! > + // In User32, these are called after: NotifyWinEvent EVENT_OBJECT_NAMECHANGE than > + // RepaintButton, StaticRepaint, NtUserCallHwndLock HWNDLOCK_ROUTINE_REDRAWFRAMEANDHOOK, etc. > /* Send shell notifications */ > if (!IntGetOwner(Window) && !IntGetParent(Window)) > { > > >

15 years, 8 months

Re: [ros-dev] [ros-diffs] [pschweitzer] 38523: - Implemeted Io(p)GetRelatedTargetDevice - Fixed FsRtlNotifyVolumeEvent

by Alex Ionescu

You can/should use IopGetDeviceNode instead of the ugly (but necessary) triple-casting you have. > + *DeviceNode = (PDEVICE_NODE) > ((PEXTENDED_DEVOBJ_EXTENSION)DeviceRelations->Objects[0]- > >DeviceObjectExtension)->DeviceNode; Also, I believe there is a bug in Nt/IoQuery/SetVolumeInformation -- we call IoGetRelatedDeviceObject instead of IoGetRelatedTargetDevice, because the function was missing. Good job! On 3-Jan-09, at 4:35 AM, pschweitzer(a)svn.reactos.org wrote: > Author: pschweitzer > Date: Sat Jan 3 03:35:10 2009 > New Revision: 38523 > > URL: http://svn.reactos.org/svn/reactos?rev=38523&view=rev > Log: > - Implemeted Io(p)GetRelatedTargetDevice > - Fixed FsRtlNotifyVolumeEvent > > Modified: > branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c > branches/pierre-fsd/ntoskrnl/include/internal/io.h > branches/pierre-fsd/ntoskrnl/io/iomgr/device.c > > Modified: branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c > URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c… > = > = > = > = > = > = > = > = > ====================================================================== > --- branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c [iso-8859-1] (original) > +++ branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c [iso-8859-1] Sat Jan 3 > 03:35:10 2009 > @@ -43,8 +43,7 @@ > PDEVICE_OBJECT DeviceObject = NULL; > TARGET_DEVICE_CUSTOM_NOTIFICATION Notification; > > - /* FIXME: We should call IoGetRelatedTargetDevice here */ > - DeviceObject = IoGetRelatedDeviceObject(FileObject); > + IoGetRelatedTargetDevice(FileObject, &DeviceObject); > if (DeviceObject) > { > Notification.Version = 1; > > Modified: branches/pierre-fsd/ntoskrnl/include/internal/io.h > URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/include/int… > = > = > = > = > = > = > = > = > ====================================================================== > --- branches/pierre-fsd/ntoskrnl/include/internal/io.h [iso-8859-1] > (original) > +++ branches/pierre-fsd/ntoskrnl/include/internal/io.h [iso-8859-1] > Sat Jan 3 03:35:10 2009 > @@ -669,6 +669,12 @@ > IN BOOLEAN ForceUnload > ); > > +NTSTATUS > +NTAPI > +IoGetRelatedTargetDevice(IN PFILE_OBJECT FileObject, > + OUT PDEVICE_OBJECT *DeviceObject > +); > + > // > // IRP Routines > // > > Modified: branches/pierre-fsd/ntoskrnl/io/iomgr/device.c > URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/io/iomgr/de… > = > = > = > = > = > = > = > = > ====================================================================== > --- branches/pierre-fsd/ntoskrnl/io/iomgr/device.c [iso-8859-1] > (original) > +++ branches/pierre-fsd/ntoskrnl/io/iomgr/device.c [iso-8859-1] Sat > Jan 3 03:35:10 2009 > @@ -552,6 +552,49 @@ > } > } > > +NTSTATUS > +NTAPI > +IopGetRelatedTargetDevice(IN PFILE_OBJECT FileObject, > + OUT PDEVICE_NODE *DeviceNode) > +{ > + NTSTATUS Status; > + IO_STACK_LOCATION Stack; > + IO_STATUS_BLOCK IoStatusBlock; > + PDEVICE_RELATIONS DeviceRelations; > + PDEVICE_OBJECT DeviceObject = NULL; > + > + ASSERT(FileObject); > + > + /* Get DeviceObject related to given FileObject */ > + DeviceObject = IoGetRelatedDeviceObject(FileObject); > + if (!DeviceObject) > + { > + return STATUS_NO_SUCH_DEVICE; > + } > + > + /* Call the driver to query all the relations (IRP_MJ_PNP) */ > + Status = IopInitiatePnpIrp(DeviceObject, &IoStatusBlock, > + IRP_MN_QUERY_DEVICE_RELATIONS, > &Stack); > + if (NT_SUCCESS(Status)) > + { > + DeviceRelations = > (PDEVICE_RELATIONS)IoStatusBlock.Information; > + ASSERT(DeviceRelations); > + ASSERT(DeviceRelations->Count == 1); > + > + /* We finally get the device node */ > + *DeviceNode = (PDEVICE_NODE) > ((PEXTENDED_DEVOBJ_EXTENSION)DeviceRelations->Objects[0]- > >DeviceObjectExtension)->DeviceNode; > + if (!*DeviceNode) > + { > + Status = STATUS_NO_SUCH_DEVICE; > + } > + > + /* Free the DEVICE_RELATIONS structure, we don't need it > anymore */ > + ExFreePool(DeviceRelations); > + } > + > + return Status; > +} > + > /* PUBLIC FUNCTIONS > ***********************************************************/ > > /* > @@ -1205,6 +1248,26 @@ > > /* Return the DO we found */ > return DeviceObject; > +} > + > +/* > + * @implemented > + */ > +NTSTATUS > +NTAPI > +IoGetRelatedTargetDevice(IN PFILE_OBJECT FileObject, > + OUT PDEVICE_OBJECT *DeviceObject) > +{ > + NTSTATUS Status; > + PDEVICE_NODE DeviceNode = NULL; > + > + /* We call the internal function to do all the work */ > + Status = IopGetRelatedTargetDevice(FileObject, &DeviceNode); > + if (NT_SUCCESS(Status) && DeviceNode) > + { > + *DeviceObject = DeviceNode->PhysicalDeviceObject; > + } > + return Status; > } > > /* > Best regards, Alex Ionescu

15 years, 8 months

Re: [ros-dev] [ros-diffs] [sginsberg] 38508: - Add Wine's GetPrivateObjectSecurity and use it instead of our that uses the unimplemented RtlQuerySecurityObject routine

by Alex Ionescu

Please don't do this -- now nobody will know that the Rtl function needs to be called! On 2-Jan-09, at 12:14 PM, sginsberg(a)svn.reactos.org wrote: > Author: sginsberg > Date: Fri Jan 2 11:14:42 2009 > New Revision: 38508 > > URL: http://svn.reactos.org/svn/reactos?rev=38508&view=rev > Log: > - Add Wine's GetPrivateObjectSecurity and use it instead of our that > uses the unimplemented RtlQuerySecurityObject routine > > Modified: > trunk/reactos/dll/win32/advapi32/sec/misc.c > > Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] > (original) > +++ trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] Fri > Jan 2 11:14:42 2009 > @@ -2250,19 +2250,25 @@ > } > > > +#if 0 > +// > +// Use when RtlQuerySecurityObject is implemented > +// > + > /* > * @implemented > */ > BOOL > WINAPI > -GetPrivateObjectSecurity(PSECURITY_DESCRIPTOR ObjectDescriptor, > - SECURITY_INFORMATION SecurityInformation, > - PSECURITY_DESCRIPTOR ResultantDescriptor, > - DWORD DescriptorLength, > - PDWORD ReturnLength) > +GetPrivateObjectSecurity(IN PSECURITY_DESCRIPTOR ObjectDescriptor, > + IN SECURITY_INFORMATION SecurityInformation, > + OUT PSECURITY_DESCRIPTOR > ResultantDescriptor OPTIONAL, > + IN DWORD DescriptorLength, > + OUT PDWORD ReturnLength) > { > NTSTATUS Status; > > + /* Call RTL */ > Status = RtlQuerySecurityObject(ObjectDescriptor, > SecurityInformation, > ResultantDescriptor, > @@ -2270,12 +2276,73 @@ > ReturnLength); > if (!NT_SUCCESS(Status)) > { > + /* Fail */ > SetLastError(RtlNtStatusToDosError(Status)); > return FALSE; > } > > + /* Success */ > return TRUE; > } > +#else > +// > +// Wine's implementation (as of December 30th 2008) > +// > + > +/* > + * @implemented > + */ > +BOOL > +WINAPI > +GetPrivateObjectSecurity(IN PSECURITY_DESCRIPTOR ObjectDescriptor, > + IN SECURITY_INFORMATION SecurityInformation, > + OUT PSECURITY_DESCRIPTOR > ResultantDescriptor OPTIONAL, > + IN DWORD DescriptorLength, > + OUT PDWORD ReturnLength) > +{ > + SECURITY_DESCRIPTOR desc; > + BOOL defaulted, present; > + PACL pacl; > + PSID psid; > + > + TRACE("(%p,0x%08x,%p,0x%08x,%p)\n", ObjectDescriptor, > SecurityInformation, > + ResultantDescriptor, DescriptorLength, ReturnLength); > + > + if (!InitializeSecurityDescriptor(&desc, > SECURITY_DESCRIPTOR_REVISION)) > + return FALSE; > + > + if (SecurityInformation & OWNER_SECURITY_INFORMATION) > + { > + if (!GetSecurityDescriptorOwner(ObjectDescriptor, &psid, > &defaulted)) > + return FALSE; > + SetSecurityDescriptorOwner(&desc, psid, defaulted); > + } > + > + if (SecurityInformation & GROUP_SECURITY_INFORMATION) > + { > + if (!GetSecurityDescriptorGroup(ObjectDescriptor, &psid, > &defaulted)) > + return FALSE; > + SetSecurityDescriptorGroup(&desc, psid, defaulted); > + } > + > + if (SecurityInformation & DACL_SECURITY_INFORMATION) > + { > + if (!GetSecurityDescriptorDacl(ObjectDescriptor, &present, > &pacl, &defaulted)) > + return FALSE; > + SetSecurityDescriptorDacl(&desc, present, pacl, defaulted); > + } > + > + if (SecurityInformation & SACL_SECURITY_INFORMATION) > + { > + if (!GetSecurityDescriptorSacl(ObjectDescriptor, &present, > &pacl, &defaulted)) > + return FALSE; > + SetSecurityDescriptorSacl(&desc, present, pacl, defaulted); > + } > + > + *ReturnLength = DescriptorLength; > + return MakeSelfRelativeSD(&desc, ResultantDescriptor, > ReturnLength); > +} > +#endif > > > /* > Best regards, Alex Ionescu

15 years, 8 months

About r38504

by Pierre SCHWEITZER

Hi, the declaration of FsRtlNotifyReportChange was correct, even if this function is now deprecated (that's why it doesn't need to be in DDK). WBR, P. Schweitzer _________________________________________________________________ Inédit ! Des Emoticônes Déjantées! Installez les dans votre Messenger ! http://www.ilovemessenger.fr/Emoticones/EmoticonesDejantees.aspx

15 years, 8 months

Re: [ros-dev] Problems installing REACTOS

by Ged

Why do you need to start on real hardware? This is fairly unsupported at the moment, so you’re really in no-mans-land here. I’d suggest a virtual machine until you become more familiar with it. Anyway, looking at your hardware spec I don’t see any untoward. Continuing down the real hardware path, your next step is to obtain debug output. The only current method to do this is via a null-modem cable, as specified in the link I gave you. Ged. From: James Muthee [mailto:jsoftpacks@yahoo.co.uk] Sent: 31 December 2008 09:12 To: Ged Subject: RE: [ros-dev] Problems installing REACTOS Hello Ged. Thanks for the prompt reply. First, I need to test the software on a real machine. No Virtualization, no support form any other OS. As for the exact configuration of the system, I am forwarding the entire report from the windows system info. I know its lengthy but, then again you would be looking for someting specific. My disks are FAT32 Please help. Thanks James I. M. --- On Tue, 30/12/08, Ged <gedmurphy(a)gmail.com> wrote: From: Ged <gedmurphy(a)gmail.com> Subject: RE: [ros-dev] Problems installing REACTOS To: jsoftpacks(a)yahoo.co.uk, "'ReactOS Development List'" <ros-dev(a)reactos.org> Date: Tuesday, 30 December, 2008, 1:59 PM It could be a whole range of things. Without having your hardware spec and debug output, it’s impossible to tell. If you just want to test it, it’s better to run it in a virtual machine. If you’re insistent on running it on hardware, then you’ll need to start by supplying your hardware details. If that doesn’t show any obvious problems (e.g. SATA, NTFS, etc) then you will need to grab debug output via a null cable modem <http://www.reactos.org/wiki/index.php/Debugging#Real_computer:_Physical_ser…> http://www.reactos.org/wiki/index.php/Debugging#Real_computer:_Physical_ser… Good luck. Ged. From: ros-dev-bounces(a)reactos.org [mailto:ros-dev-bounces@reactos.org] On Behalf Of James Muthee Sent: 30 December 2008 11:21 To: ros-dev(a)reactos.org Subject: [ros-dev] Problems installing REACTOS Hello. Having downloaded the software (I was amazed it was less than 40MB), I wrote the ISO on a CD and started the installation. 0.3.7 failed to install completely, stopping dead just after loading the initial files. I downloaded the 0.3.6 and tried again. This time, I was able to install the first portion (copying the textmode installation to the hard disk and modifying the MBR). On restart, A GUI window flashed then a blue screen with a single line about the Build, and that was the end. What am I doing wrong? I would appreciate any help. I really want to test drive this software. James I. M.

15 years, 8 months

Re: [ros-dev] [ros-diffs] [hyperion] 38461: modified tests/pseh2/psehtest.c finally_13 test re-enabled, as it doesn't crash anymore finally_14 test fixed. Now we know how exceptions thrown in a __finally are supposed to be handled PSEH test suite now has 91 tests and passes all of them with both GCC and Visual C++

by Aleksey Bragin

Just wanted to tell this is a great work, and with such test suite we will always notice if something breaks. WBR, Aleksey Bragin. On Dec 30, 2008, at 7:04 AM, hyperion(a)svn.reactos.org wrote: > Author: hyperion > Date: Mon Dec 29 22:04:51 2008 > New Revision: 38461 > > URL: http://svn.reactos.org/svn/reactos?rev=38461&view=rev > Log: > modified tests/pseh2/psehtest.c > finally_13 test re-enabled, as it doesn't crash anymore > finally_14 test fixed. Now we know how exceptions thrown in a > __finally are supposed to be handled > PSEH test suite now has 91 tests and passes all of them with > both GCC and Visual C++

15 years, 9 months

Problems installing REACTOS

by James Muthee

Hello. Having downloaded the software (I was amazed it was less than 40MB), I wrote the ISO on a CD and started the installation. 0.3.7 failed to install completely, stopping dead just after loading the initial files. I downloaded the 0.3.6 and tried again. This time, I was able to install the first portion (copying the textmode installation to the hard disk and modifying the MBR). On restart, A GUI window flashed then a blue screen with a single line about the Build, and that was the end. What am I doing wrong? I would appreciate any help. I really want to test drive this software. James I. M.

15 years, 9 months

[ros-diffs] [dgorbachev] 38455: - Fix indentation. - Fix bug #3920 (at line 736).

by Dmitry Gorbachev

> But my point was, line 736 is almost impossible to find when looking > at a diff. Oh, I see. I wrote that thoughtlessly.

15 years, 9 months

[ros-diffs] [dgorbachev] 38455: - Fix indentation. - Fix bug #3920 (at line 736).

by Dmitry Gorbachev

> I can't find the bug fix using the ros-diffs mail list It is at line 736. + hpsxa[1] = NULL;

15 years, 9 months

Re: [ros-dev] [ros-diffs] [dgorbachev] 38455: - Fix indentation. - Fix bug #3920 (at line 736).

by Ged

It's best to keep formatting and code fixes separate. I can't find the bug fix using the ros-diffs mail list Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of dgorbachev(a)svn.reactos.org Sent: 29 December 2008 11:50 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [dgorbachev] 38455: - Fix indentation. - Fix bug #3920 (at line 736). Author: dgorbachev Date: Mon Dec 29 05:50:09 2008 New Revision: 38455 URL: http://svn.reactos.org/svn/reactos?rev=38455&view=rev Log: - Fix indentation. - Fix bug #3920 (at line 736). Modified: trunk/reactos/dll/win32/shell32/fprop.c Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] Mon Dec 29 05:50:09 2008 @@ -25,12 +25,13 @@ #define MAX_PROPERTY_SHEET_PAGE 32 typedef struct _LANGANDCODEPAGE_ - { +{ WORD lang; WORD code; } LANGANDCODEPAGE, *LPLANGANDCODEPAGE; HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface, IDataObject *pDataObj); + /************************************************************************* * * SH_CreatePropertySheetPage [Internal] @@ -38,6 +39,7 @@ * creates a property sheet page from an resource name * */ + HPROPSHEETPAGE SH_CreatePropertySheetPage(LPSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWSTR szTitle) { @@ -55,7 +57,9 @@ ERR("failed to find resource name\n"); return (HPROPSHEETPAGE)0; } + lpsztemplate = LoadResource(shell32_hInstance, hRes); + if (lpsztemplate == NULL) return (HPROPSHEETPAGE)0; @@ -66,18 +70,14 @@ ppage.pfnDlgProc = dlgproc; ppage.lParam = lParam; ppage.pszTitle = szTitle; + if (szTitle) { ppage.dwFlags |= PSP_USETITLE; } + return CreatePropertySheetPageW(&ppage); } - - - - - - /************************************************************************* * @@ -90,67 +90,72 @@ */ BOOL -SH_FileGeneralSetFileType(HWND hwndDlg, WCHAR * filext) -{ - WCHAR name[MAX_PATH]; - WCHAR value[MAX_PATH]; - DWORD lname = MAX_PATH; - DWORD lvalue = MAX_PATH; - - HKEY hKey; - LONG result; - HWND hDlgCtrl; - - TRACE("fileext %s\n", debugstr_w(filext)); - - if (filext == NULL) - return FALSE; - - hDlgCtrl = GetDlgItem(hwndDlg, 14005); - - if (hDlgCtrl == NULL) - return FALSE; - - if (RegOpenKeyW(HKEY_CLASSES_ROOT, filext, &hKey) != ERROR_SUCCESS) - { - /* the fileextension is unknown, so default to string "FileExtension File" */ - SendMessageW(hDlgCtrl, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)value); - swprintf(name, value, &filext[1]); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)name); - return TRUE; - } - result = RegEnumValueW(hKey, 0, name, &lname, NULL, NULL, (LPBYTE)value, &lvalue); - RegCloseKey(hKey); +SH_FileGeneralSetFileType(HWND hwndDlg, WCHAR *filext) +{ + WCHAR name[MAX_PATH]; + WCHAR value[MAX_PATH]; + DWORD lname = MAX_PATH; + DWORD lvalue = MAX_PATH; + HKEY hKey; + LONG result; + HWND hDlgCtrl; + + TRACE("fileext %s\n", debugstr_w(filext)); + + if (filext == NULL) + return FALSE; + + hDlgCtrl = GetDlgItem(hwndDlg, 14005); + + if (hDlgCtrl == NULL) + return FALSE; + + if (RegOpenKeyW(HKEY_CLASSES_ROOT, filext, &hKey) != ERROR_SUCCESS) + { + /* the file extension is unknown, so default to string "FileExtension File" */ + SendMessageW(hDlgCtrl, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)value); + swprintf(name, value, &filext[1]); + SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)name); + return TRUE; + } + + result = RegEnumValueW(hKey, 0, name, &lname, NULL, NULL, (LPBYTE)value, &lvalue); + RegCloseKey(hKey); if (result != ERROR_SUCCESS) return FALSE; + if (RegOpenKeyW(HKEY_CLASSES_ROOT, value, &hKey) == ERROR_SUCCESS) { if (RegLoadMUIStringW(hKey, L"FriendlyTypeName", value, MAX_PATH, NULL, 0, NULL) != ERROR_SUCCESS) { lvalue = lname = MAX_PATH; - result = RegEnumValueW(hKey,0, name, &lname, NULL, NULL, (LPBYTE)value, &lvalue); + result = RegEnumValueW(hKey, 0, name, &lname, NULL, NULL, (LPBYTE)value, &lvalue); } + lname = MAX_PATH; + if (RegGetValueW(hKey, L"DefaultIcon", NULL, RRF_RT_REG_SZ, NULL, name, &lname) == ERROR_SUCCESS) { UINT IconIndex; WCHAR szBuffer[MAX_PATH]; - WCHAR * Offset; + WCHAR *Offset; HICON hIcon = 0; HRSRC hResource; LPVOID pResource = NULL; HGLOBAL hGlobal; HANDLE hLibrary; Offset = wcsrchr(name, L','); + if (Offset) { IconIndex = _wtoi(Offset + 2); *Offset = L'\0'; - name[MAX_PATH-1] = L'\0'; + name[MAX_PATH - 1] = L'\0'; + if (ExpandEnvironmentStringsW(name, szBuffer, MAX_PATH)) { - szBuffer[MAX_PATH-1] = L'\0'; + szBuffer[MAX_PATH - 1] = L'\0'; hLibrary = LoadLibraryExW(szBuffer, NULL, LOAD_LIBRARY_AS_DATAFILE); if (hLibrary) { @@ -164,7 +169,13 @@ if (pResource != NULL) { hIcon = CreateIconFromResource(pResource, SizeofResource(shell32_hInstance, hResource), TRUE, 0x00030000); - TRACE("hIcon %p,- szBuffer %s IconIndex %u error %u icon %p hResource %p pResource %p\n", hIcon, debugstr_w(szBuffer), IconIndex, MAKEINTRESOURCEW(IconIndex), hResource, pResource); + TRACE("hIcon %p,- szBuffer %s IconIndex %u error %u icon %p hResource %p pResource %p\n", + hIcon, + debugstr_w(szBuffer), + IconIndex, + MAKEINTRESOURCEW(IconIndex), + hResource, + pResource); SendDlgItemMessageW(hwndDlg, 14000, STM_SETICON, (WPARAM)hIcon, 0); } } @@ -178,10 +189,12 @@ } /* file extension type */ - value[MAX_PATH-1] = L'\0'; + value[MAX_PATH - 1] = L'\0'; SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)value); + return TRUE; } + /************************************************************************* * * SHFileGeneralGetFileTimeString [Internal] @@ -190,12 +203,14 @@ */ BOOL -SHFileGeneralGetFileTimeString(LPFILETIME lpFileTime, WCHAR * lpResult) +SHFileGeneralGetFileTimeString(LPFILETIME lpFileTime, WCHAR *lpResult) { FILETIME ft; SYSTEMTIME dt; WORD wYear; - static const WCHAR wFormat[] = {'%','0','2','d','/','%','0','2','d','/','%','0','4','d',' ',' ','%','0','2','d',':','%','0','2','u',0}; + static const WCHAR wFormat[] = { + '%', '0', '2', 'd', '/', '%', '0', '2', 'd', '/', '%', '0', '4', 'd', + ' ', ' ', '%', '0', '2', 'd', ':', '%', '0', '2', 'u', 0 }; if (lpFileTime == NULL || lpResult == NULL) return FALSE; @@ -206,10 +221,11 @@ FileTimeToSystemTime(&ft, &dt); wYear = dt.wYear; + /* ddmmyy */ - swprintf (lpResult, wFormat, dt.wDay, dt.wMonth, wYear, dt.wHour, dt.wMinute); - - TRACE("result %s\n",debugstr_w(lpResult)); + swprintf(lpResult, wFormat, dt.wDay, dt.wMonth, wYear, dt.wHour, dt.wMinute); + + TRACE("result %s\n", debugstr_w(lpResult)); return TRUE; } @@ -222,18 +238,18 @@ */ BOOL -SH_FileGeneralSetText(HWND hwndDlg, WCHAR * lpstr) +SH_FileGeneralSetText(HWND hwndDlg, WCHAR *lpstr) { int flength; int plength; - WCHAR * lpdir; + WCHAR *lpdir; WCHAR buff[MAX_PATH]; HWND hDlgCtrl; if (lpstr == NULL) return FALSE; - lpdir = wcschr(lpstr, '\\'); /* find the last occurence of '\\' */ + lpdir = wcschr(lpstr, '\\'); /* find the last occurence of '\\' */ plength = wcslen(lpstr); flength = wcslen(lpdir); @@ -247,12 +263,12 @@ SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)buff); } - if(flength > 1) - { - /* text filename field */ - wcsncpy(buff, &lpdir[1], flength); - hDlgCtrl = GetDlgItem(hwndDlg, 14001); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)buff); + if (flength > 1) + { + /* text filename field */ + wcsncpy(buff, &lpdir[1], flength); + hDlgCtrl = GetDlgItem(hwndDlg, 14001); + SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)buff); } return TRUE; @@ -267,7 +283,7 @@ */ BOOL -SH_FileGeneralSetFileSizeTime(HWND hwndDlg, WCHAR * lpfilename, PULARGE_INTEGER lpfilesize) +SH_FileGeneralSetFileSizeTime(HWND hwndDlg, WCHAR *lpfilename, PULARGE_INTEGER lpfilesize) { BOOL result; HANDLE hFile; @@ -283,7 +299,8 @@ hFile = CreateFileW(lpfilename, GENERIC_READ, - FILE_SHARE_READ,NULL, + FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -301,7 +318,8 @@ WARN("GetFileTime failed\n"); return FALSE; } - if (SHFileGeneralGetFileTimeString(&create_time,resultstr)) + + if (SHFileGeneralGetFileTimeString(&create_time, resultstr)) { hDlgCtrl = GetDlgItem(hwndDlg, 14015); SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)resultstr); @@ -325,15 +343,21 @@ CloseHandle(hFile); return FALSE; } + CloseHandle(hFile); - if (!StrFormatByteSizeW(file_size.QuadPart, resultstr, sizeof(resultstr) / sizeof(WCHAR))) - return FALSE; + + if (!StrFormatByteSizeW(file_size.QuadPart, + resultstr, + sizeof(resultstr) / sizeof(WCHAR))) + return FALSE; + hDlgCtrl = GetDlgItem(hwndDlg, 14011); + TRACE("result size %u resultstr %s\n", file_size.QuadPart, debugstr_w(resultstr)); SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)resultstr); if (lpfilesize) - lpfilesize->QuadPart = (ULONGLONG)file_size.QuadPart; + lpfilesize->QuadPart = (ULONGLONG)file_size.QuadPart; return TRUE; } @@ -346,23 +370,24 @@ */ BOOL -SH_FileVersionQuerySetText(HWND hwndDlg, DWORD dlgId, LPVOID pInfo, WCHAR * text, WCHAR ** resptr) -{ - UINT reslen; - HWND hDlgCtrl; - - if(hwndDlg == NULL || resptr == NULL || text == NULL) - return FALSE; - - if(VerQueryValueW(pInfo, text, (LPVOID *)resptr, &reslen)) - { - /* file description property */ - hDlgCtrl = GetDlgItem(hwndDlg, dlgId); - TRACE("%s :: %s\n",debugstr_w(text), debugstr_w(*resptr)); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)0, (LPARAM)*resptr); - return TRUE; - } - return FALSE; +SH_FileVersionQuerySetText(HWND hwndDlg, DWORD dlgId, LPVOID pInfo, WCHAR *text, WCHAR **resptr) +{ + UINT reslen; + HWND hDlgCtrl; + + if (hwndDlg == NULL || resptr == NULL || text == NULL) + return FALSE; + + if (VerQueryValueW(pInfo, text, (LPVOID *)resptr, &reslen)) + { + /* file description property */ + hDlgCtrl = GetDlgItem(hwndDlg, dlgId); + TRACE("%s :: %s\n", debugstr_w(text), debugstr_w(*resptr)); + SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)0, (LPARAM)*resptr); + return TRUE; + } + + return FALSE; } /************************************************************************* @@ -373,33 +398,35 @@ * */ - BOOL -SH_FileVersionQuerySetListText(HWND hwndDlg, LPVOID pInfo, const WCHAR * text, WCHAR **resptr, WORD lang, WORD code) -{ - UINT reslen; - HWND hDlgCtrl; - UINT index; - static const WCHAR wFormat[] = { '\\','S','t','r','i','n','g','F','i','l','e','I','n', - 'f','o','\\','%','0','4','x','%','0','4','x','\\','%','s',0 }; - WCHAR buff[256]; - - TRACE("text %s, resptr %p hwndDlg %p\n",debugstr_w(text), resptr, hwndDlg); - - if(hwndDlg == NULL || resptr == NULL || text == NULL) - return FALSE; - - swprintf(buff, wFormat, lang, code, text); - if(VerQueryValueW(pInfo, buff, (LPVOID *)resptr, &reslen)) - { - /* listbox name property */ - hDlgCtrl = GetDlgItem(hwndDlg, 14009); - TRACE("%s :: %s\n",debugstr_w(text), debugstr_w(*resptr)); - index = SendMessageW(hDlgCtrl, LB_ADDSTRING, (WPARAM)-1, (LPARAM)text); - SendMessageW(hDlgCtrl, LB_SETITEMDATA, (WPARAM)index, (LPARAM)(WCHAR*)*resptr); - return TRUE; - } - return FALSE; +SH_FileVersionQuerySetListText(HWND hwndDlg, LPVOID pInfo, const WCHAR *text, WCHAR **resptr, WORD lang, WORD code) +{ + UINT reslen; + HWND hDlgCtrl; + UINT index; + static const WCHAR wFormat[] = { + '\\', 'S', 't', 'r', 'i', 'n', 'g', 'F', 'i', 'l', 'e', 'I', 'n', 'f', 'o', + '\\', '%', '0', '4', 'x', '%', '0', '4', 'x', '\\', '%', 's', 0 }; + WCHAR buff[256]; + + TRACE("text %s, resptr %p hwndDlg %p\n", debugstr_w(text), resptr, hwndDlg); + + if (hwndDlg == NULL || resptr == NULL || text == NULL) + return FALSE; + + swprintf(buff, wFormat, lang, code, text); + + if (VerQueryValueW(pInfo, buff, (LPVOID *)resptr, &reslen)) + { + /* listbox name property */ + hDlgCtrl = GetDlgItem(hwndDlg, 14009); + TRACE("%s :: %s\n", debugstr_w(text), debugstr_w(*resptr)); + index = SendMessageW(hDlgCtrl, LB_ADDSTRING, (WPARAM)-1, (LPARAM)text); + SendMessageW(hDlgCtrl, LB_SETITEMDATA, (WPARAM)index, (LPARAM)(WCHAR *)*resptr); + return TRUE; + } + + return FALSE; } /************************************************************************* @@ -408,102 +435,117 @@ * * sets all file version properties in dialog */ + BOOL -SH_FileVersionInitialize(HWND hwndDlg, WCHAR * lpfilename) -{ - LPVOID pBuf; - DWORD versize; - DWORD handle; - LPVOID info = NULL; - UINT infolen; - WCHAR buff[256]; - HWND hDlgCtrl; - WORD lang = 0; - WORD code = 0; - LPLANGANDCODEPAGE lplangcode; - WCHAR * str; - static const WCHAR wVersionFormat[] = { '%','d','.','%','d','.','%','d','.','%','d',0 }; - static const WCHAR wFileDescriptionFormat[] = { '\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', - '\\','%','0','4','x','%','0','4','x','\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0 }; - static const WCHAR wLegalCopyrightFormat[] = { '\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', - '\\','%','0','4','x','%','0','4','x','\\','L','e','g','a','l','C','o','p','y','r','i','g','h','t',0 }; - static const WCHAR wTranslation[] = { 'V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n',0 }; - static const WCHAR wCompanyName[] = { 'C','o','m','p','a','n','y','N','a','m','e',0 }; - static const WCHAR wFileVersion[] = { 'F','i','l','e','V','e','r','s','i','o','n',0 }; - static const WCHAR wInternalName[] = { 'I','n','t','e','r','n','a','l','N','a','m','e',0 }; - static const WCHAR wOriginalFilename[] = { 'O','r','i','g','i','n','a','l','F','i','l','e','n','a','m','e',0 }; - static const WCHAR wProductName[] = { 'P','r','o','d','u','c','t','N','a','m','e',0 }; - static const WCHAR wProductVersion[] = { 'P','r','o','d','u','c','t','V','e','r','s','i','o','n',0 }; - static const WCHAR wSlash[] = { '\\',0 }; - - - if(lpfilename == 0) - return FALSE; - - if(!(versize = GetFileVersionInfoSizeW(lpfilename, &handle))) - { - WARN("GetFileVersionInfoSize failed\n"); - return FALSE; - } - - if(!(pBuf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, versize))) - { - WARN("HeapAlloc failed bytes %x\n",versize); - return FALSE; - } - - if(!GetFileVersionInfoW(lpfilename, handle, versize, pBuf)) - { - HeapFree(GetProcessHeap(), 0, pBuf); - return FALSE; - } - if(VerQueryValueW(pBuf, wSlash, &info, &infolen)) - { - VS_FIXEDFILEINFO * inf = (VS_FIXEDFILEINFO *)info; - swprintf(buff, wVersionFormat, HIWORD(inf->dwFileVersionMS), - LOWORD(inf->dwFileVersionMS), - HIWORD(inf->dwFileVersionLS), - LOWORD(inf->dwFileVersionLS)); - - hDlgCtrl = GetDlgItem(hwndDlg, 14001); - TRACE("MS %x LS %x res %s \n",inf->dwFileVersionMS, inf->dwFileVersionLS, debugstr_w(buff)); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)buff); - } - if(VerQueryValueW(pBuf, wTranslation, (LPVOID *)&lplangcode, &infolen)) - { - /* FIXME find language from current locale / if not available, - * default to english - * for now default to first available language - */ - lang = lplangcode->lang; - code = lplangcode->code; - } - - swprintf(buff, wFileDescriptionFormat, lang, code); - SH_FileVersionQuerySetText(hwndDlg, 14003, pBuf, buff, &str); - - swprintf(buff, wLegalCopyrightFormat, lang, code); - SH_FileVersionQuerySetText(hwndDlg, 14005, pBuf, buff, &str); - - /* listbox properties */ - SH_FileVersionQuerySetListText(hwndDlg, pBuf, wCompanyName, &str, lang, code); - SH_FileVersionQuerySetListText(hwndDlg, pBuf, wFileVersion, &str, lang, code); - SH_FileVersionQuerySetListText(hwndDlg, pBuf, wInternalName, &str, lang, code); - - /* FIXME insert language identifier */ - - SH_FileVersionQuerySetListText(hwndDlg, pBuf, wOriginalFilename, &str, lang, code); - SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductName, &str, lang, code); - SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductVersion, &str, lang, code); - SetWindowLong(hwndDlg, DWL_USER, (LONG)pBuf); - - /* select first item */ - hDlgCtrl = GetDlgItem(hwndDlg, 14009); - SendMessageW(hDlgCtrl, LB_SETCURSEL, 0, 0); - str = (WCHAR *)SendMessageW(hDlgCtrl, LB_GETITEMDATA, (WPARAM)0, (LPARAM)NULL); - hDlgCtrl = GetDlgItem(hwndDlg, 14010); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)str); - return TRUE; +SH_FileVersionInitialize(HWND hwndDlg, WCHAR *lpfilename) +{ + LPVOID pBuf; + DWORD versize; + DWORD handle; + LPVOID info = NULL; + UINT infolen; + WCHAR buff[256]; + HWND hDlgCtrl; + WORD lang = 0; + WORD code = 0; + LPLANGANDCODEPAGE lplangcode; + WCHAR *str; + static const WCHAR wVersionFormat[] = { + '%', 'd', '.', '%', 'd', '.', '%', 'd', '.', '%', 'd', 0 }; + static const WCHAR wFileDescriptionFormat[] = { + '\\', 'S', 't', 'r', 'i', 'n', 'g', 'F', 'i', 'l', 'e', 'I', 'n', 'f', 'o', + '\\', '%', '0', '4', 'x', '%', '0', '4', 'x', + '\\', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'i', 'o', 'n', 0 }; + static const WCHAR wLegalCopyrightFormat[] = { + '\\', 'S', 't', 'r', 'i', 'n', 'g', 'F', 'i', 'l', 'e', 'I', 'n', 'f', 'o', + '\\', '%', '0', '4', 'x', '%', '0', '4', 'x', + '\\', 'L', 'e', 'g', 'a', 'l', 'C', 'o', 'p', 'y', 'r', 'i', 'g', 'h', 't', 0 }; + static const WCHAR wTranslation[] = { + 'V', 'a', 'r', 'F', 'i', 'l', 'e', 'I', 'n', 'f', 'o', + '\\', 'T', 'r', 'a', 'n', 's', 'l', 'a', 't', 'i', 'o', 'n', 0 }; + static const WCHAR wCompanyName[] = { + 'C', 'o', 'm', 'p', 'a', 'n', 'y', 'N', 'a', 'm', 'e', 0 }; + static const WCHAR wFileVersion[] = { + 'F', 'i', 'l', 'e', 'V', 'e', 'r', 's', 'i', 'o', 'n', 0 }; + static const WCHAR wInternalName[] = { + 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'N', 'a', 'm', 'e', 0 }; + static const WCHAR wOriginalFilename[] = { + 'O', 'r', 'i', 'g', 'i', 'n', 'a', 'l', 'F', 'i', 'l', 'e', 'n', 'a', 'm', 'e', 0 }; + static const WCHAR wProductName[] = { + 'P', 'r', 'o', 'd', 'u', 'c', 't', 'N', 'a', 'm', 'e', 0 }; + static const WCHAR wProductVersion[] = { + 'P', 'r', 'o', 'd', 'u', 'c', 't', 'V', 'e', 'r', 's', 'i', 'o', 'n', 0 }; + static const WCHAR wSlash[] = { '\\', 0 }; + + if (lpfilename == 0) + return FALSE; + + if (!(versize = GetFileVersionInfoSizeW(lpfilename, &handle))) + { + WARN("GetFileVersionInfoSize failed\n"); + return FALSE; + } + + if (!(pBuf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, versize))) + { + WARN("HeapAlloc failed bytes %x\n", versize); + return FALSE; + } + + if (!GetFileVersionInfoW(lpfilename, handle, versize, pBuf)) + { + HeapFree(GetProcessHeap(), 0, pBuf); + return FALSE; + } + + if (VerQueryValueW(pBuf, wSlash, &info, &infolen)) + { + VS_FIXEDFILEINFO *inf = (VS_FIXEDFILEINFO *)info; + swprintf(buff, wVersionFormat, HIWORD(inf->dwFileVersionMS), + LOWORD(inf->dwFileVersionMS), + HIWORD(inf->dwFileVersionLS), + LOWORD(inf->dwFileVersionLS)); + hDlgCtrl = GetDlgItem(hwndDlg, 14001); + TRACE("MS %x LS %x res %s \n", inf->dwFileVersionMS, inf->dwFileVersionLS, debugstr_w(buff)); + SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)buff); + } + + if (VerQueryValueW(pBuf, wTranslation, (LPVOID *)&lplangcode, &infolen)) + { + /* FIXME find language from current locale / if not available, + * default to english + * for now default to first available language + */ + lang = lplangcode->lang; + code = lplangcode->code; + } + + swprintf(buff, wFileDescriptionFormat, lang, code); + SH_FileVersionQuerySetText(hwndDlg, 14003, pBuf, buff, &str); + + swprintf(buff, wLegalCopyrightFormat, lang, code); + SH_FileVersionQuerySetText(hwndDlg, 14005, pBuf, buff, &str); + + /* listbox properties */ + SH_FileVersionQuerySetListText(hwndDlg, pBuf, wCompanyName, &str, lang, code); + SH_FileVersionQuerySetListText(hwndDlg, pBuf, wFileVersion, &str, lang, code); + SH_FileVersionQuerySetListText(hwndDlg, pBuf, wInternalName, &str, lang, code); + + /* FIXME insert language identifier */ + + SH_FileVersionQuerySetListText(hwndDlg, pBuf, wOriginalFilename, &str, lang, code); + SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductName, &str, lang, code); + SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductVersion, &str, lang, code); + SetWindowLong(hwndDlg, DWL_USER, (LONG)pBuf); + + /* select first item */ + hDlgCtrl = GetDlgItem(hwndDlg, 14009); + SendMessageW(hDlgCtrl, LB_SETCURSEL, 0, 0); + str = (WCHAR *) SendMessageW(hDlgCtrl, LB_GETITEMDATA, (WPARAM)0, (LPARAM)NULL); + hDlgCtrl = GetDlgItem(hwndDlg, 14010); + SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)str); + + return TRUE; } /************************************************************************* @@ -512,70 +554,71 @@ * * wnd proc of 'Version' property sheet page */ + INT_PTR CALLBACK -SH_FileVersionDlgProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - LPPROPSHEETPAGE ppsp; - WCHAR * lpstr; - LPVOID * buf; - switch(uMsg) - { - case WM_INITDIALOG: - ppsp = (LPPROPSHEETPAGE)lParam; - if(ppsp == NULL) - break; - - TRACE("WM_INITDIALOG hwnd %p lParam %p ppsplParam %x\n",hwndDlg, lParam, ppsp->lParam); - - lpstr = (WCHAR *)ppsp->lParam; - - if(lpstr == NULL) - break; - - return SH_FileVersionInitialize(hwndDlg, lpstr); - - - case WM_COMMAND: - if(LOWORD(wParam) == 14009 && HIWORD(wParam) == LBN_DBLCLK) - { - HWND hDlgCtrl; - LRESULT lresult; - WCHAR * str; - - hDlgCtrl = GetDlgItem(hwndDlg, 14009); - lresult = SendMessageW(hDlgCtrl, LB_GETCURSEL, (WPARAM)NULL, (LPARAM)NULL); - if(lresult == LB_ERR) - { - break; - } - str = (WCHAR *)SendMessageW(hDlgCtrl, LB_GETITEMDATA, (WPARAM)lresult, (LPARAM)NULL); - - if(str == NULL) - { - break; - } - hDlgCtrl = GetDlgItem(hwndDlg, 14010); - TRACE("hDlgCtrl %x string %s \n",hDlgCtrl, debugstr_w(str)); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)str); - return TRUE; - } - break; - - case WM_DESTROY: - buf = (LPVOID)GetWindowLong(hwndDlg, DWL_USER); - HeapFree(GetProcessHeap(), 0, buf); - break; - - default: - break; - } - return FALSE; +SH_FileVersionDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + LPPROPSHEETPAGE ppsp; + WCHAR *lpstr; + LPVOID *buf; + + switch (uMsg) + { + case WM_INITDIALOG: + ppsp = (LPPROPSHEETPAGE)lParam; + + if (ppsp == NULL) + break; + + TRACE("WM_INITDIALOG hwnd %p lParam %p ppsplParam %x\n", hwndDlg, lParam, ppsp->lParam); + + lpstr = (WCHAR *)ppsp->lParam; + + if (lpstr == NULL) + break; + + return SH_FileVersionInitialize(hwndDlg, lpstr); + + case WM_COMMAND: + if (LOWORD(wParam) == 14009 && HIWORD(wParam) == LBN_DBLCLK) + { + HWND hDlgCtrl; + LRESULT lresult; + WCHAR *str; + + hDlgCtrl = GetDlgItem(hwndDlg, 14009); + lresult = SendMessageW(hDlgCtrl, LB_GETCURSEL, (WPARAM)NULL, (LPARAM)NULL); + + if (lresult == LB_ERR) + break; + + str = (WCHAR *) SendMessageW(hDlgCtrl, LB_GETITEMDATA, (WPARAM)lresult, (LPARAM)NULL); + + if (str == NULL) + break; + + hDlgCtrl = GetDlgItem(hwndDlg, 14010); + TRACE("hDlgCtrl %x string %s \n", hDlgCtrl, debugstr_w(str)); + SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)str); + + return TRUE; + } + break; + + case WM_DESTROY: + buf = (LPVOID) GetWindowLong(hwndDlg, DWL_USER); + HeapFree(GetProcessHeap(), 0, buf); + break; + + default: + break; + } + + return FALSE; } /************************************************************************* @@ -588,44 +631,54 @@ INT_PTR CALLBACK -SH_FileGeneralDlgProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) +SH_FileGeneralDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { LPPROPSHEETPAGEW ppsp; - WCHAR * lpstr; - switch(uMsg) - { - case WM_INITDIALOG: - ppsp = (LPPROPSHEETPAGEW)lParam; - if (ppsp == NULL) + WCHAR *lpstr; + + switch (uMsg) + { + case WM_INITDIALOG: + ppsp = (LPPROPSHEETPAGEW)lParam; + + if (ppsp == NULL) + break; + + TRACE("WM_INITDIALOG hwnd %p lParam %p ppsplParam %S\n", hwndDlg, lParam, ppsp->lParam); + + lpstr = (WCHAR *)ppsp->lParam; + + if (lpstr == NULL) + { + ERR("no filename\n"); + break; + } + + /* set general text properties filename filelocation and icon */ + SH_FileGeneralSetText(hwndDlg, lpstr); + + /* enumerate file extension from registry and application which opens it */ + SH_FileGeneralSetFileType(hwndDlg, wcsrchr(lpstr, '.')); + + /* set file time create/modfied/accessed */ + SH_FileGeneralSetFileSizeTime(hwndDlg, lpstr, NULL); + + return TRUE; + + default: break; - TRACE("WM_INITDIALOG hwnd %p lParam %p ppsplParam %S\n",hwndDlg, lParam, ppsp->lParam); - - lpstr = (WCHAR *)ppsp->lParam; - - if ( lpstr == NULL) - { - ERR("no filename\n"); - break; - } - /* set general text properties filename filelocation and icon */ - SH_FileGeneralSetText(hwndDlg, lpstr); - /* enumerate file extension from registry and application which opens it*/ - SH_FileGeneralSetFileType(hwndDlg, wcsrchr(lpstr, '.')); - /* set file time create/modfied/accessed */ - SH_FileGeneralSetFileSizeTime(hwndDlg, lpstr, NULL); - return TRUE; - default: - break; - } - return FALSE; -} - -BOOL CALLBACK AddShellPropSheetExCallback(HPROPSHEETPAGE hPage, LPARAM lParam) + } + + return FALSE; +} + +BOOL +CALLBACK +AddShellPropSheetExCallback(HPROPSHEETPAGE hPage, + LPARAM lParam) { PROPSHEETHEADERW *pinfo = (PROPSHEETHEADERW *)lParam; @@ -634,66 +687,73 @@ pinfo->u3.phpage[pinfo->nPages++] = hPage; return TRUE; } + return FALSE; } - int -EnumPropSheetExt(LPWSTR wFileName, PROPSHEETHEADERW *pinfo, int NumPages, HPSXA * hpsxa, IDataObject *pDataObj) -{ - WCHAR szName[MAX_PATH] = {0}; - WCHAR * pOffset; +EnumPropSheetExt(LPWSTR wFileName, PROPSHEETHEADERW *pinfo, int NumPages, HPSXA *hpsxa, IDataObject *pDataObj) +{ + WCHAR szName[MAX_PATH] = { 0 }; + WCHAR *pOffset; UINT Length; DWORD dwName; int Pages; CLSID clsid; pOffset = wcsrchr(wFileName, L'.'); + if (!pOffset) { Length = wcslen(szName); - if (Length + 6 > sizeof(szName)/sizeof(szName[0])) - return 0; + + if (Length + 6 > sizeof(szName) / sizeof(szName[0])) + return 0; if (CLSIDFromString(wFileName, &clsid) == NOERROR) { - wcscpy(szName, L"CLSID\\"); - wcscpy(&szName[6], wFileName); + wcscpy(szName, L"CLSID\\"); + wcscpy(&szName[6], wFileName); } else { - wcscpy(szName, wFileName); + wcscpy(szName, wFileName); } } else { Length = wcslen(pOffset); - if (Length >= sizeof(szName)/sizeof(szName[0])) + + if (Length >= sizeof(szName) / sizeof(szName[0])) return 0; + wcscpy(szName, pOffset); } + TRACE("EnumPropSheetExt szName %s\n", debugstr_w(szName)); + hpsxa[0] = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, szName, NumPages, pDataObj); + hpsxa[1] = NULL; + Pages = SHAddFromPropSheetExtArray(hpsxa[0], AddShellPropSheetExCallback, (LPARAM)pinfo); - if (pOffset) { /* try to load property sheet handlers from prog id key */ dwName = sizeof(szName); + if (RegGetValueW(HKEY_CLASSES_ROOT, pOffset, NULL, RRF_RT_REG_SZ, NULL, szName, &dwName) == ERROR_SUCCESS) { TRACE("EnumPropSheetExt szName %s, pOffset %s\n", debugstr_w(szName), debugstr_w(pOffset)); - szName[(sizeof(szName)/sizeof(WCHAR))-1] = L'\0'; + szName[(sizeof(szName) / sizeof(WCHAR)) - 1] = L'\0'; hpsxa[1] = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, szName, NumPages - Pages, pDataObj); - Pages +=SHAddFromPropSheetExtArray(hpsxa[1], AddShellPropSheetExCallback, (LPARAM)pinfo); + Pages += SHAddFromPropSheetExtArray(hpsxa[1], AddShellPropSheetExCallback, (LPARAM)pinfo); } } + return Pages; } - - /************************************************************************* * * SH_ShowPropertiesDialog @@ -703,38 +763,39 @@ * lpf contains (quoted) path of folder/file * * TODO: provide button change application type if file has registered type - * make filename field editable and apply changes to filename on close + * make filename field editable and apply changes to filename on close */ BOOL -SH_ShowPropertiesDialog(WCHAR * lpf, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST * apidl) +SH_ShowPropertiesDialog(WCHAR *lpf, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *apidl) { PROPSHEETHEADERW pinfo; HPROPSHEETPAGE hppages[MAX_PROPERTY_SHEET_PAGE]; WCHAR wFileName[MAX_PATH]; DWORD dwHandle = 0; - WCHAR * pFileName; + WCHAR *pFileName; HPSXA hpsxa[2]; INT_PTR res; - IDataObject* pDataObj = NULL; + IDataObject *pDataObj = NULL; HRESULT hResult; TRACE("SH_ShowPropertiesDialog entered filename %s\n", debugstr_w(lpf)); - if (lpf== NULL) - return FALSE; - - if ( !wcslen(lpf) ) + if (lpf == NULL) + return FALSE; + + if (!wcslen(lpf)) return FALSE; memset(hppages, 0x0, sizeof(HPROPSHEETPAGE) * MAX_PROPERTY_SHEET_PAGE); + if (lpf[0] == '"') { /* remove quotes from lpf */ LPCWSTR src = lpf + 1; LPWSTR dst = wFileName; - while(*src && *src!='"') + while (*src && *src != '"') *dst++ = *src++; *dst = '\0'; @@ -754,13 +815,12 @@ return SH_ShowDriveProperties(wFileName, pidlFolder, apidl); } - pFileName = wcsrchr(wFileName, '\\'); + if (!pFileName) pFileName = wFileName; else pFileName++; - memset(&pinfo, 0x0, sizeof(PROPSHEETHEADERW)); pinfo.dwSize = sizeof(PROPSHEETHEADERW); @@ -768,24 +828,33 @@ pinfo.u3.phpage = hppages; pinfo.pszCaption = pFileName; - hppages[pinfo.nPages] = SH_CreatePropertySheetPage("SHELL_FILE_GENERAL_DLG", SH_FileGeneralDlgProc, (LPARAM)wFileName, NULL); + hppages[pinfo.nPages] = + SH_CreatePropertySheetPage("SHELL_FILE_GENERAL_DLG", + SH_FileGeneralDlgProc, + (LPARAM)wFileName, + NULL); + if (hppages[pinfo.nPages]) pinfo.nPages++; - - hResult = SHCreateDataObject(pidlFolder, 1, apidl, NULL, &IID_IDataObject, (LPVOID*)&pDataObj); + hResult = SHCreateDataObject(pidlFolder, 1, apidl, NULL, &IID_IDataObject, (LPVOID *)&pDataObj); + if (hResult == S_OK) { - if (!EnumPropSheetExt(wFileName, &pinfo, MAX_PROPERTY_SHEET_PAGE-1, hpsxa, pDataObj)) + if (!EnumPropSheetExt(wFileName, &pinfo, MAX_PROPERTY_SHEET_PAGE - 1, hpsxa, pDataObj)) { hpsxa[0] = NULL; hpsxa[1] = NULL; } } - if ( GetFileVersionInfoSizeW(lpf, &dwHandle)) - { - hppages[pinfo.nPages] = SH_CreatePropertySheetPage("SHELL_FILE_VERSION_DLG",SH_FileVersionDlgProc, (LPARAM)wFileName, NULL); + if (GetFileVersionInfoSizeW(lpf, &dwHandle)) + { + hppages[pinfo.nPages] = + SH_CreatePropertySheetPage("SHELL_FILE_VERSION_DLG", + SH_FileVersionDlgProc, + (LPARAM)wFileName, + NULL); if (hppages[pinfo.nPages]) pinfo.nPages++; } @@ -794,11 +863,12 @@ if (hResult == S_OK) { - SHDestroyPropSheetExtArray(hpsxa[0]); - SHDestroyPropSheetExtArray(hpsxa[1]); + SHDestroyPropSheetExtArray(hpsxa[0]); + SHDestroyPropSheetExtArray(hpsxa[1]); IDataObject_Release(pDataObj); } return (res != -1); } + /*EOF */

15 years, 9 months

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-dev