Skip to content

Commit 4855b89

Browse files
zakiroofzakiroof
authored
[win_toast] Fix not working if packaged by msix(#375)
1 parent 3e4247b commit 4855b89

File tree

5 files changed

+57
-65
lines changed

5 files changed

+57
-65
lines changed

‎packages/win_toast/example/pubspec.lock‎

Lines changed: 42 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ packages:
1313
dependency: transitive
1414
description:
1515
name: archive
16-
sha256: ed7cc591a948744994714375caf9a2ce89e1d82e8243997c8a2994d57181c212
16+
sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
1717
url: "https://pub.dev"
1818
source: hosted
19-
version: "3.3.5"
19+
version: "3.6.1"
2020
args:
2121
dependency: transitive
2222
description:
@@ -29,10 +29,10 @@ packages:
2929
dependency: transitive
3030
description:
3131
name: async
32-
sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
32+
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
3333
url: "https://pub.dev"
3434
source: hosted
35-
version: "2.10.0"
35+
version: "2.11.0"
3636
boolean_selector:
3737
dependency: transitive
3838
description:
@@ -45,18 +45,18 @@ packages:
4545
dependency: transitive
4646
description:
4747
name: characters
48-
sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
48+
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
4949
url: "https://pub.dev"
5050
source: hosted
51-
version: "1.2.1"
51+
version: "1.3.0"
5252
cli_util:
5353
dependency: transitive
5454
description:
5555
name: cli_util
56-
sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c"
56+
sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19
5757
url: "https://pub.dev"
5858
source: hosted
59-
version: "0.3.5"
59+
version: "0.4.1"
6060
clock:
6161
dependency: transitive
6262
description:
@@ -69,10 +69,10 @@ packages:
6969
dependency: transitive
7070
description:
7171
name: collection
72-
sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
72+
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
7373
url: "https://pub.dev"
7474
source: hosted
75-
version: "1.17.0"
75+
version: "1.18.0"
7676
console:
7777
dependency: transitive
7878
description:
@@ -81,22 +81,14 @@ packages:
8181
url: "https://pub.dev"
8282
source: hosted
8383
version: "4.1.0"
84-
convert:
85-
dependency: transitive
86-
description:
87-
name: convert
88-
sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
89-
url: "https://pub.dev"
90-
source: hosted
91-
version: "3.1.1"
9284
crypto:
9385
dependency: transitive
9486
description:
9587
name: crypto
96-
sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
88+
sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
9789
url: "https://pub.dev"
9890
source: hosted
99-
version: "3.0.2"
91+
version: "3.0.3"
10092
cupertino_icons:
10193
dependency: "direct main"
10294
description:
@@ -159,10 +151,10 @@ packages:
159151
dependency: transitive
160152
description:
161153
name: image
162-
sha256: f6ffe2895e3c86c6ad5a27e6302cf807403463e397cb2f0c580f619ac2fa588b
154+
sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d
163155
url: "https://pub.dev"
164156
source: hosted
165-
version: "3.2.2"
157+
version: "4.3.0"
166158
intl:
167159
dependency: transitive
168160
description:
@@ -171,14 +163,6 @@ packages:
171163
url: "https://pub.dev"
172164
source: hosted
173165
version: "0.17.0"
174-
js:
175-
dependency: transitive
176-
description:
177-
name: js
178-
sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
179-
url: "https://pub.dev"
180-
source: hosted
181-
version: "0.6.5"
182166
lints:
183167
dependency: transitive
184168
description:
@@ -191,26 +175,26 @@ packages:
191175
dependency: transitive
192176
description:
193177
name: matcher
194-
sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
178+
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
195179
url: "https://pub.dev"
196180
source: hosted
197-
version: "0.12.13"
181+
version: "0.12.16"
198182
material_color_utilities:
199183
dependency: transitive
200184
description:
201185
name: material_color_utilities
202-
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
186+
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
203187
url: "https://pub.dev"
204188
source: hosted
205-
version: "0.2.0"
189+
version: "0.5.0"
206190
meta:
207191
dependency: transitive
208192
description:
209193
name: meta
210-
sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
194+
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
211195
url: "https://pub.dev"
212196
source: hosted
213-
version: "1.8.0"
197+
version: "1.10.0"
214198
mixin_logger:
215199
dependency: "direct main"
216200
description:
@@ -223,10 +207,10 @@ packages:
223207
dependency: "direct dev"
224208
description:
225209
name: msix
226-
sha256: e3de4d9f52543ad6e4b0f534991e1303cbd379d24be28dd241ac60bd9439a201
210+
sha256: c50d6bd1aafe0d071a3c1e5a5ccb056404502935cb0a549e3178c4aae16caf33
227211
url: "https://pub.dev"
228212
source: hosted
229-
version: "3.7.0"
213+
version: "3.16.8"
230214
package_config:
231215
dependency: transitive
232216
description:
@@ -239,10 +223,10 @@ packages:
239223
dependency: "direct main"
240224
description:
241225
name: path
242-
sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
226+
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
243227
url: "https://pub.dev"
244228
source: hosted
245-
version: "1.8.2"
229+
version: "1.8.3"
246230
path_provider:
247231
dependency: "direct main"
248232
description:
@@ -323,14 +307,6 @@ packages:
323307
url: "https://pub.dev"
324308
source: hosted
325309
version: "2.1.3"
326-
pointycastle:
327-
dependency: transitive
328-
description:
329-
name: pointycastle
330-
sha256: db7306cf0249f838d1a24af52b5a5887c5bf7f31d8bb4e827d071dc0939ad346
331-
url: "https://pub.dev"
332-
source: hosted
333-
version: "3.6.2"
334310
process:
335311
dependency: transitive
336312
description:
@@ -356,26 +332,26 @@ packages:
356332
dependency: transitive
357333
description:
358334
name: source_span
359-
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
335+
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
360336
url: "https://pub.dev"
361337
source: hosted
362-
version: "1.9.1"
338+
version: "1.10.0"
363339
stack_trace:
364340
dependency: transitive
365341
description:
366342
name: stack_trace
367-
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
343+
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
368344
url: "https://pub.dev"
369345
source: hosted
370-
version: "1.11.0"
346+
version: "1.11.1"
371347
stream_channel:
372348
dependency: transitive
373349
description:
374350
name: stream_channel
375-
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
351+
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
376352
url: "https://pub.dev"
377353
source: hosted
378-
version: "2.1.1"
354+
version: "2.1.2"
379355
string_scanner:
380356
dependency: transitive
381357
description:
@@ -396,10 +372,10 @@ packages:
396372
dependency: transitive
397373
description:
398374
name: test_api
399-
sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
375+
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
400376
url: "https://pub.dev"
401377
source: hosted
402-
version: "0.4.16"
378+
version: "0.6.1"
403379
typed_data:
404380
dependency: transitive
405381
description:
@@ -416,6 +392,14 @@ packages:
416392
url: "https://pub.dev"
417393
source: hosted
418394
version: "2.1.4"
395+
web:
396+
dependency: transitive
397+
description:
398+
name: web
399+
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
400+
url: "https://pub.dev"
401+
source: hosted
402+
version: "0.3.0"
419403
win32:
420404
dependency: transitive
421405
description:
@@ -430,7 +414,7 @@ packages:
430414
path: ".."
431415
relative: true
432416
source: path
433-
version: "0.2.0"
417+
version: "0.3.0"
434418
xdg_directories:
435419
dependency: transitive
436420
description:
@@ -456,5 +440,5 @@ packages:
456440
source: hosted
457441
version: "3.1.1"
458442
sdks:
459-
dart: ">=2.18.0 <4.0.0"
443+
dart: ">=3.2.0-194.0.dev <4.0.0"
460444
flutter: ">=3.0.0"

‎packages/win_toast/example/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dev_dependencies:
2222
flutter_test:
2323
sdk: flutter
2424
flutter_lints: ^2.0.1
25-
msix: ^3.7.0
25+
msix: ^3.16.8
2626

2727
flutter:
2828
uses-material-design: true

‎packages/win_toast/example/windows/flutter/CMakeLists.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ include(${EPHEMERAL_DIR}/generated_config.cmake)
99
# https://github.com/flutter/flutter/issues/57146.
1010
set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper")
1111

12+
# Set fallback configurations for older versions of the flutter tool.
13+
if (NOT DEFINED FLUTTER_TARGET_PLATFORM)
14+
set(FLUTTER_TARGET_PLATFORM "windows-x64")
15+
endif()
16+
1217
# === Flutter Library ===
1318
set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll")
1419

@@ -91,7 +96,7 @@ add_custom_command(
9196
COMMAND ${CMAKE_COMMAND} -E env
9297
${FLUTTER_TOOL_ENVIRONMENT}
9398
"${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat"
94-
windows-x64 $<CONFIG>
99+
${FLUTTER_TARGET_PLATFORM} $<CONFIG>
95100
VERBATIM
96101
)
97102
add_custom_target(flutter_assemble DEPENDS

‎packages/win_toast/example/windows/runner/Runner.rc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ IDI_APP_ICON ICON "resources\\app_icon.ico"
6060
// Version
6161
//
6262

63-
#ifdef FLUTTER_BUILD_NUMBER
64-
#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER
63+
#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD)
64+
#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD
6565
#else
66-
#define VERSION_AS_NUMBER 1,0,0
66+
#define VERSION_AS_NUMBER 1,0,0,0
6767
#endif
6868

69-
#ifdef FLUTTER_BUILD_NAME
70-
#define VERSION_AS_STRING #FLUTTER_BUILD_NAME
69+
#if defined(FLUTTER_VERSION)
70+
#define VERSION_AS_STRING FLUTTER_VERSION
7171
#else
7272
#define VERSION_AS_STRING "1.0.0"
7373
#endif

‎packages/win_toast/windows/notification_manager.cc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ bool hasIdentity() {
1919
UINT32 length;
2020
wchar_t packageFamilyName[PACKAGE_FAMILY_NAME_MAX_LENGTH + 1];
2121
LONG result = DllImporter::GetPackageFamilyName(GetCurrentProcess(), &length, packageFamilyName);
22+
if(result == ERROR_INSUFFICIENT_BUFFER){
23+
result = DllImporter::GetPackageFamilyName(GetCurrentProcess(), &length, packageFamilyName);
24+
}
2225
return result == ERROR_SUCCESS;
2326
}
2427

0 commit comments

Comments
 (0)