free allocations

format code

Author: adpinola

packages/file_selector/file_selector_windows/lib/file_selector_windows.dart

@@ -16,7 +16,9 @@ class FileSelectorWindows extends FileSelectorPlatform {
   /// Creates a new instance of [FileSelectorApi].
   FileSelectorWindows()
       : _hostApi = FileSelectorApi(DialogWrapperFactory(
-            FileDialogControllerFactory(), IFileDialogFactory()));
+          FileDialogControllerFactory(),
+          IFileDialogFactory(),
+        ));
 
   /// Creates a fake implementation of [FileSelectorApi] for testing purposes.
   @visibleForTesting
@@ -36,11 +38,10 @@ class FileSelectorWindows extends FileSelectorPlatform {
     String? confirmButtonText,
   }) async {
     final List<String?> paths = _hostApi.showOpenDialog(
-        SelectionOptions(
-          allowedTypes: _allowedXTypeGroups(acceptedTypeGroups),
-        ),
-        initialDirectory,
-        confirmButtonText);
+      SelectionOptions(allowedTypes: _allowedXTypeGroups(acceptedTypeGroups)),
+      initialDirectory,
+      confirmButtonText,
+    );
     return paths.isEmpty ? null : XFile(paths.first!);
   }
 
@@ -51,12 +52,10 @@ class FileSelectorWindows extends FileSelectorPlatform {
     String? confirmButtonText,
   }) async {
     final List<String?> paths = _hostApi.showOpenDialog(
-        SelectionOptions(
-          allowMultiple: true,
-          allowedTypes: _allowedXTypeGroups(acceptedTypeGroups),
-        ),
-        initialDirectory,
-        confirmButtonText);
+      SelectionOptions(allowMultiple: true, allowedTypes: _allowedXTypeGroups(acceptedTypeGroups)),
+      initialDirectory,
+      confirmButtonText,
+    );
     return paths.map((String? path) => XFile(path!)).toList();
   }
 
@@ -68,12 +67,11 @@ class FileSelectorWindows extends FileSelectorPlatform {
     String? confirmButtonText,
   }) async {
     final List<String?> paths = _hostApi.showSaveDialog(
-        SelectionOptions(
-          allowedTypes: _allowedXTypeGroups(acceptedTypeGroups),
-        ),
-        initialDirectory,
-        suggestedName,
-        confirmButtonText);
+      SelectionOptions(allowedTypes: _allowedXTypeGroups(acceptedTypeGroups)),
+      initialDirectory,
+      suggestedName,
+      confirmButtonText,
+    );
     return paths.isEmpty ? null : paths.first!;
   }
 
@@ -83,12 +81,10 @@ class FileSelectorWindows extends FileSelectorPlatform {
     String? confirmButtonText,
   }) async {
     final List<String?> paths = _hostApi.showOpenDialog(
-        SelectionOptions(
-          selectFolders: true,
-          allowedTypes: <XTypeGroup>[],
-        ),
-        initialDirectory,
-        confirmButtonText);
+      SelectionOptions(selectFolders: true, allowedTypes: <XTypeGroup>[]),
+      initialDirectory,
+      confirmButtonText,
+    );
     return paths.isEmpty ? null : paths.first!;
   }
 }

packages/file_selector/file_selector_windows/lib/src/file_selector_api.dart

@@ -21,7 +21,9 @@ class FileSelectorApi {
   /// from the outside.
   @visibleForTesting
   FileSelectorApi.useFakeForegroundWindow(
-      this._dialogWrapperFactory, this._foregroundWindow);
+    this._dialogWrapperFactory,
+    this._foregroundWindow,
+  );
 
   final DialogWrapperFactory _dialogWrapperFactory;
 
@@ -33,8 +35,14 @@ class FileSelectorApi {
     String? initialDirectory,
     String? confirmButtonText,
   ) =>
-      _showDialog(_foregroundWindow, DialogMode.Open, options, initialDirectory,
-          null, confirmButtonText);
+      _showDialog(
+        _foregroundWindow,
+        DialogMode.open,
+        options,
+        initialDirectory,
+        null,
+        confirmButtonText,
+      );
 
   /// Displays a dialog used to save a file.
   List<String?> showSaveDialog(
@@ -43,18 +51,24 @@ class FileSelectorApi {
     String? suggestedName,
     String? confirmButtonText,
   ) =>
-      _showDialog(_foregroundWindow, DialogMode.Save, options, initialDirectory,
-          suggestedName, confirmButtonText);
+      _showDialog(
+        _foregroundWindow,
+        DialogMode.save,
+        options,
+        initialDirectory,
+        suggestedName,
+        confirmButtonText,
+      );
 
   List<String?> _showDialog(
-      int parentWindow,
-      DialogMode mode,
-      SelectionOptions options,
-      String? initialDirectory,
-      String? suggestedName,
-      String? confirmLabel) {
-    final DialogWrapper dialogWrapper =
-        _dialogWrapperFactory.createInstance(mode);
+    int parentWindow,
+    DialogMode mode,
+    SelectionOptions options,
+    String? initialDirectory,
+    String? suggestedName,
+    String? confirmLabel,
+  ) {
+    final DialogWrapper dialogWrapper = _dialogWrapperFactory.createInstance(mode);
     if (!SUCCEEDED(dialogWrapper.lastResult)) {
       throw WindowsException(E_FAIL);
     }

packages/file_selector/file_selector_windows/lib/src/file_selector_dart/dialog_mode.dart

@@ -5,8 +5,8 @@
 /// The kind of file dialog to show.
 enum DialogMode {
   /// Used for chosing files.
-  Open,
+  open,
 
   /// Used for chosing a directory to save a file.
-  Save
+  save
 }

packages/file_selector/file_selector_windows/lib/src/file_selector_dart/dialog_wrapper.dart

@@ -21,9 +21,11 @@ import 'shell_win32_api.dart';
 class DialogWrapper {
   /// Creates a DialogWrapper using a [IFileDialogControllerFactory] and a [DialogMode].
   /// It is also responsible of creating a [IFileDialog].
-  DialogWrapper(IFileDialogControllerFactory fileDialogControllerFactory,
-      IFileDialogFactory fileDialogFactory, this._dialogMode)
-      : _isOpenDialog = _dialogMode == DialogMode.Open {
+  DialogWrapper(
+    IFileDialogControllerFactory fileDialogControllerFactory,
+    IFileDialogFactory fileDialogFactory,
+    this._dialogMode,
+  ) : _isOpenDialog = _dialogMode == DialogMode.open {
     try {
       final IFileDialog dialog = fileDialogFactory.createInstace(_dialogMode);
       _dialogController = fileDialogControllerFactory.createController(dialog);
@@ -37,39 +39,40 @@ class DialogWrapper {
 
   /// Creates a DialogWrapper for testing purposes.
   @visibleForTesting
-  DialogWrapper.withFakeDependencies(FileDialogController dialogController,
-      this._dialogMode, this._shellWin32Api)
-      : _isOpenDialog = _dialogMode == DialogMode.Open,
+  DialogWrapper.withFakeDependencies(
+    FileDialogController dialogController,
+    this._dialogMode,
+    this._shellWin32Api,
+  )   : _isOpenDialog = _dialogMode == DialogMode.open,
         _dialogController = dialogController;
 
-  int _lastResult = S_OK;
-
   final DialogMode _dialogMode;
 
   final bool _isOpenDialog;
 
-  final String _allowAnyValue = 'Any';
+  late final FileDialogController _dialogController;
 
-  final String _allowAnyExtension = '*.*';
+  late final ShellWin32Api _shellWin32Api;
 
-  late FileDialogController _dialogController;
+  static const String _allowAnyValue = 'Any';
 
-  late ShellWin32Api _shellWin32Api;
+  static const String _allowAnyExtension = '*.*';
 
   /// Returns the result of the last Win32 API call related to this object.
   int get lastResult => _lastResult;
 
+  int _lastResult = S_OK;
+
   /// Attempts to set the default folder for the dialog to [path], if it exists.
   void setFolder(String path) {
-    if (path == null || path.isEmpty) {
+    if (path.isEmpty) {
       return;
     }
 
     using((Arena arena) {
       final Pointer<GUID> ptrGuid = GUIDFromString(IID_IShellItem);
       final Pointer<Pointer<COMObject>> ptrPath = arena<Pointer<COMObject>>();
-      _lastResult =
-          _shellWin32Api.createItemFromParsingName(path, ptrGuid, ptrPath);
+      _lastResult = _shellWin32Api.createItemFromParsingName(path, ptrGuid, ptrPath);
 
       if (!SUCCEEDED(_lastResult)) {
         return;
@@ -125,19 +128,19 @@ class DialogWrapper {
     }
 
     using((Arena arena) {
-      final Pointer<COMDLG_FILTERSPEC> registerFilterSpecification =
-          arena<COMDLG_FILTERSPEC>(filterSpecification.length);
-
+      final Pointer<COMDLG_FILTERSPEC> registerFilterSpecification = arena<COMDLG_FILTERSPEC>(filterSpecification.length);
       int index = 0;
       for (final String key in filterSpecification.keys) {
         registerFilterSpecification[index]
-          ..pszName = TEXT(key)
-          ..pszSpec = TEXT(filterSpecification[key]!);
-        index++;
+          ..pszName = key.toNativeUtf16(allocator: arena)
+          ..pszSpec = filterSpecification[key]!.toNativeUtf16(allocator: arena);
+        index += 1;
       }
 
       _lastResult = _dialogController.setFileTypes(
-          filterSpecification.length, registerFilterSpecification);
+          filterSpecification.length,
+          registerFilterSpecification,
+        );
     });
   }
 
@@ -150,11 +153,9 @@ class DialogWrapper {
     late List<String>? files;
 
     using((Arena arena) {
-      final Pointer<Pointer<COMObject>> shellItemArrayPtr =
-          arena<Pointer<COMObject>>();
+      final Pointer<Pointer<COMObject>> shellItemArrayPtr = arena<Pointer<COMObject>>();
       final Pointer<Uint32> shellItemCountPtr = arena<Uint32>();
-      final Pointer<Pointer<COMObject>> shellItemPtr =
-          arena<Pointer<COMObject>>();
+      final Pointer<Pointer<COMObject>> shellItemPtr = arena<Pointer<COMObject>>();
 
       files =
           _getFilePathList(shellItemArrayPtr, shellItemCountPtr, shellItemPtr);
@@ -179,7 +180,7 @@ class DialogWrapper {
       if (!SUCCEEDED(_lastResult)) {
         return null;
       }
-      for (int index = 0; index < shellItemCountPtr.value; index++) {
+      for (int index = 0; index < shellItemCountPtr.value; index += 1) {
         shellItemResources.getItemAt(index, shellItemPtr);
         final IShellItem shellItem = IShellItem(shellItemPtr.cast());
         files.add(_shellWin32Api.getPathForShellItem(shellItem));

packages/file_selector/file_selector_windows/lib/src/file_selector_dart/dialog_wrapper_factory.dart

@@ -12,7 +12,9 @@ class DialogWrapperFactory {
   /// Creates a [DialogWrapperFactory] that makes use of [IFileDialogControllerFactory] and [IFileDialogFactory]
   /// to create [DialogWrapper] instances.
   DialogWrapperFactory(
-      this._fileDialogControllerFactory, this._fileDialogFactory);
+    this._fileDialogControllerFactory,
+    this._fileDialogFactory,
+  );
 
   final IFileDialogControllerFactory _fileDialogControllerFactory;
 
@@ -21,6 +23,9 @@ class DialogWrapperFactory {
   /// Creates a [DialogWrapper] based on [dialogMode].
   DialogWrapper createInstance(DialogMode dialogMode) {
     return DialogWrapper(
-        _fileDialogControllerFactory, _fileDialogFactory, dialogMode);
+      _fileDialogControllerFactory,
+      _fileDialogFactory,
+      dialogMode,
+    );
   }
 }

packages/file_selector/file_selector_windows/lib/src/file_selector_dart/file_dialog_controller.dart

@@ -4,6 +4,7 @@
 
 import 'dart:ffi';
 
+import 'package:ffi/ffi.dart';
 import 'package:win32/win32.dart';
 
 import 'ifile_open_dialog_factory.dart';
@@ -17,24 +18,25 @@ class FileDialogController {
   /// It also receives an IFileOpenDialogFactory to construct [IFileOpenDialog]
   /// instances.
   FileDialogController(
-      IFileDialog fileDialog, IFileOpenDialogFactory iFileOpenDialogFactory)
-      : _fileDialog = fileDialog,
+    IFileDialog fileDialog,
+    IFileOpenDialogFactory iFileOpenDialogFactory,
+  )   : _fileDialog = fileDialog,
         _iFileOpenDialogFactory = iFileOpenDialogFactory;
 
   /// The [IFileDialog] to work with.
   final IFileDialog _fileDialog;
 
-  /// The [IFileOpenDialogFactory] to work construc [IFileOpenDialog] instances.
+  /// The [IFileOpenDialogFactory] to create [IFileOpenDialog] instances.
   final IFileOpenDialogFactory _iFileOpenDialogFactory;
 
   /// Sets the default folder for the dialog to [path]. It also returns the operation result.
-  int setFolder(Pointer<COMObject> path) {
-    return _fileDialog.setFolder(path);
-  }
+  int setFolder(Pointer<COMObject> path) => _fileDialog.setFolder(path);
 
   /// Sets the file [name] that is initially shown in the IFileDialog. It also returns the operation result.
   int setFileName(String name) {
-    return _fileDialog.setFileName(TEXT(name));
+    return using((Arena arena) {
+      return _fileDialog.setFileName(name.toNativeUtf16(allocator: arena));
+    }, malloc);
   }
 
   /// Sets the allowed file type extensions in the IFileOpenDialog. It also returns the operation result.
@@ -44,7 +46,9 @@ class FileDialogController {
 
   /// Sets the label of the confirmation button. It also returns the operation result. It also returns the operation result.
   int setOkButtonLabel(String text) {
-    return _fileDialog.setOkButtonLabel(TEXT(text));
+    return using((Arena arena) {
+      return _fileDialog.setOkButtonLabel(text.toNativeUtf16(allocator: arena));
+    }, malloc);
   }
 
   /// Gets the IFileDialog's [options](https://pub.dev/documentation/win32/latest/winrt/FILEOPENDIALOGOPTIONS-class.html),
@@ -55,14 +59,10 @@ class FileDialogController {
 
   /// Sets the [options](https://pub.dev/documentation/win32/latest/winrt/FILEOPENDIALOGOPTIONS-class.html),
   /// which is a bitfield, into the IFileDialog. It also returns the operation result.
-  int setOptions(int options) {
-    return _fileDialog.setOptions(options);
-  }
+  int setOptions(int options) => _fileDialog.setOptions(options);
 
   /// Shows an IFileDialog using the given parent. It returns the operation result.
-  int show(int parent) {
-    return _fileDialog.show(parent);
-  }
+  int show(int parent) => _fileDialog.show(parent);
 
   /// Return results from an IFileDialog. This should be used when selecting
   /// single items. It also returns the operation result.
@@ -79,7 +79,7 @@ class FileDialogController {
     try {
       fileOpenDialog = _iFileOpenDialogFactory.from(_fileDialog);
       return fileOpenDialog.getResults(outItems);
-    } catch (_) {
+    } catch (exception) {
       return E_FAIL;
     } finally {
       fileOpenDialog?.release();

packages/file_selector/file_selector_windows/lib/src/file_selector_dart/ifile_dialog_factory.dart

@@ -10,10 +10,11 @@ import 'dialog_mode.dart';
 class IFileDialogFactory {
   /// Creates the corresponding IFileDialog instace. The caller is responsible of releasing the resource.
   IFileDialog createInstace(DialogMode dialogMode) {
-    if (dialogMode == DialogMode.Open) {
-      return FileOpenDialog.createInstance();
+    switch (dialogMode) {
+      case DialogMode.open:
+        return FileOpenDialog.createInstance();
+      case DialogMode.save:
+        return FileSaveDialog.createInstance();
     }
-
-    return FileSaveDialog.createInstance();
   }
 }