Skip to content

Commit e011af0

Browse files
DistroHopper39BDistroHopper39B
committed
Merge branch 'master' into AppleTV-Desktop
2 parents d7377bb + d39657c commit e011af0

File tree

400 files changed

+27276
-17113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

400 files changed

+27276
-17113
lines changed

‎.github/workflows/build.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
sudo ./llvm.sh $LLVM_VERSION
4747
echo "D_CLANG_VERSION=-DCLANG_VERSION=$LLVM_VERSION" >> $GITHUB_ENV
4848
- name: Source checkout
49-
uses: actions/checkout@v4
49+
uses: actions/checkout@v6
5050
with:
5151
path: src
5252
- name: Set up cache for ccache
@@ -74,7 +74,7 @@ jobs:
7474
- name: Print ccache statistics
7575
run: ccache -s
7676
- name: Upload ISOs
77-
uses: actions/upload-artifact@v4
77+
uses: actions/upload-artifact@v5
7878
with:
7979
name: reactos-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}}
8080
path: |
@@ -119,7 +119,7 @@ jobs:
119119
arch: amd64
120120
toolset: ${{matrix.toolset}}
121121
- name: Source checkout
122-
uses: actions/checkout@v4
122+
uses: actions/checkout@v6
123123
with:
124124
path: src
125125
- name: Configure
@@ -129,15 +129,15 @@ jobs:
129129
- name: Generate ISOs
130130
run: cmake --build build --target bootcd --target livecd
131131
- name: Upload ISOs
132-
uses: actions/upload-artifact@v4
132+
uses: actions/upload-artifact@v5
133133
with:
134134
name: reactos-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}}
135135
path: |
136136
build/bootcd.iso
137137
build/livecd.iso
138138
- name: Upload debug symbols
139139
if: ${{ matrix.config == 'Debug' }}
140-
uses: actions/upload-artifact@v4
140+
uses: actions/upload-artifact@v5
141141
with:
142142
name: reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}}
143143
path: build/msvc_pdb
@@ -182,7 +182,7 @@ jobs:
182182
arch: amd64_arm64
183183
toolset: ${{matrix.toolset}}
184184
- name: Source checkout
185-
uses: actions/checkout@v4
185+
uses: actions/checkout@v6
186186
with:
187187
path: src
188188
- name: Configure
@@ -218,7 +218,7 @@ jobs:
218218
if: ${{ matrix.arch == 'arm64' }}
219219
run: cmake --build build --target dll/cpl/all -- -k0
220220
- name: Upload compiled binaries
221-
uses: actions/upload-artifact@v4
221+
uses: actions/upload-artifact@v5
222222
with:
223223
name: reactos-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
224224
path: |
@@ -245,7 +245,7 @@ jobs:
245245
!**/*.tlb
246246
- name: Upload debug symbols
247247
if: ${{ matrix.config == 'Debug' }}
248-
uses: actions/upload-artifact@v4
248+
uses: actions/upload-artifact@v5
249249
with:
250250
name: reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
251251
path: build/msvc_pdb
@@ -287,7 +287,7 @@ jobs:
287287
- name: Add LLVM to PATH
288288
run: echo "${env:LLVM_PATH}" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
289289
- name: Source checkout
290-
uses: actions/checkout@v4
290+
uses: actions/checkout@v6
291291
with:
292292
path: src
293293
- name: Configure
@@ -297,15 +297,15 @@ jobs:
297297
- name: Generate ISOs
298298
run: cmake --build build --target bootcd --target livecd
299299
- name: Upload ISOs
300-
uses: actions/upload-artifact@v4
300+
uses: actions/upload-artifact@v5
301301
with:
302302
name: reactos-clang-cl-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
303303
path: |
304304
build/bootcd.iso
305305
build/livecd.iso
306306
- name: Upload debug symbols
307307
if: ${{ matrix.config == 'Debug' }}
308-
uses: actions/upload-artifact@v4
308+
uses: actions/upload-artifact@v5
309309
with:
310310
name: reactos-syms-clang-cl-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
311311
path: build/msvc_pdb
@@ -325,7 +325,7 @@ jobs:
325325
uses: ilammy/msvc-dev-cmd@v1
326326
with:
327327
arch: amd64_x86
328-
- uses: actions/checkout@v4
328+
- uses: actions/checkout@v6
329329
with:
330330
path: src
331331
- name: Configure

‎.github/workflows/labeler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ jobs:
66
triage:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/labeler@v5
9+
- uses: actions/labeler@v6
1010
with:
1111
sync-labels: true

‎.github/workflows/stale.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
pull-requests: write
1818

1919
steps:
20-
- uses: actions/stale@v9
20+
- uses: actions/stale@v10
2121
with:
2222
repo-token: ${{ secrets.GITHUB_TOKEN }}
2323
days-before-stale: 120

‎base/applications/cmdutils/hostname/hostname.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
#include <stdlib.h>
10-
#include <conio.h>
10+
#include <stdio.h>
1111

1212
#include <windef.h>
1313
#include <winbase.h>
@@ -39,7 +39,7 @@ int wmain(int argc, WCHAR* argv[])
3939
if (bSuccess)
4040
{
4141
/* Print out the host name */
42-
_cwprintf(L"%s\n", HostName);
42+
wprintf(L"%s\n", HostName);
4343
}
4444

4545
/* If a larger buffer has been allocated, free it */
@@ -50,7 +50,7 @@ int wmain(int argc, WCHAR* argv[])
5050
{
5151
/* Fail in case of error */
5252
LoadStringW(GetModuleHandle(NULL), IDS_ERROR, Msg, _countof(Msg));
53-
_cwprintf(L"%s %lu.\n", Msg, GetLastError());
53+
wprintf(L"%s %lu.\n", Msg, GetLastError());
5454
return 1;
5555
}
5656
}
@@ -60,14 +60,14 @@ int wmain(int argc, WCHAR* argv[])
6060
{
6161
/* The program doesn't allow the user to set the host name */
6262
LoadStringW(GetModuleHandle(NULL), IDS_NOSET, Msg, _countof(Msg));
63-
_cwprintf(L"%s\n", Msg);
63+
wprintf(L"%s\n", Msg);
6464
return 1;
6565
}
6666
else
6767
{
6868
/* Let the user know what the program does */
6969
LoadStringW(GetModuleHandle(NULL), IDS_USAGE, Msg, _countof(Msg));
70-
_cwprintf(L"\n%s\n\n", Msg);
70+
wprintf(L"\n%s\n\n", Msg);
7171
}
7272
}
7373

‎base/applications/network/netsh/netsh.c‎

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,15 @@ FreeQuotedString(
273273
HeapFree(GetProcessHeap(), 0, pszQuotedString);
274274
}
275275

276+
VOID
277+
WINAPI
278+
FreeString(
279+
_In_ LPWSTR pszString)
280+
{
281+
DPRINT("FreeString(%S)\n", pszString);
282+
LocalFree(pszString);
283+
}
284+
276285
LPWSTR
277286
WINAPI
278287
MakeQuotedString(
@@ -286,11 +295,49 @@ MakeQuotedString(
286295
if (pszQuotedString == NULL)
287296
return NULL;
288297

289-
swprintf(pszQuotedString, L"\"%s\"", pszQuotedString);
298+
swprintf(pszQuotedString, L"\"%s\"", pszString);
290299

291300
return pszQuotedString;
292301
}
293302

303+
LPWSTR
304+
CDECL
305+
MakeString(
306+
_In_ HANDLE hModule,
307+
_In_ DWORD dwMsgId,
308+
...)
309+
{
310+
LPWSTR pszInBuffer, pszOutBuffer = NULL;
311+
DWORD dwLength;
312+
va_list ap;
313+
314+
DPRINT("MakeString(%p %lu ...)\n", hModule, dwMsgId);
315+
316+
va_start(ap, dwMsgId);
317+
318+
pszInBuffer = HeapAlloc(GetProcessHeap(), 0, HUGE_BUFFER_SIZE * sizeof(WCHAR));
319+
if (pszInBuffer == NULL)
320+
return NULL;
321+
322+
dwLength = LoadStringW(hModule, dwMsgId, pszInBuffer, HUGE_BUFFER_SIZE);
323+
if (dwLength > 0)
324+
goto done;
325+
326+
FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING,
327+
pszInBuffer,
328+
0,
329+
0,
330+
(LPWSTR)&pszOutBuffer,
331+
0,
332+
&ap);
333+
334+
done:
335+
if (pszInBuffer)
336+
HeapFree(GetProcessHeap(), 0, pszInBuffer);
337+
338+
return pszOutBuffer;
339+
}
340+
294341
DWORD
295342
WINAPI
296343
MatchEnumTag(

‎base/applications/network/netsh/netsh.spec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
@ stub DisplayMessageM
44
@ stub DisplayMessageToConsole
55
@ stdcall FreeQuotedString(wstr)
6-
@ stub FreeString
6+
@ stdcall FreeString(wstr)
77
@ stub GenericMonitor
88
@ stub GetEnumString
99
@ stub GetHostMachineInfo
1010
@ stub InitializeConsole
1111
@ stdcall MakeQuotedString(wstr)
12-
@ stub MakeString
12+
@ varargs MakeString(ptr long)
1313
@ stub MatchCmdLine
1414
@ stdcall MatchEnumTag(ptr wstr long ptr ptr)
1515
@ stub MatchTagsInCmdLine

‎base/applications/taskmgr/graphctl.c‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,15 @@ GraphCtrl_Create(PTM_GRAPH_CONTROL inst, HWND hWnd, HWND hParentWnd, PTM_FORMAT
6767
inst->ftPixelsPerPercent = (FLOAT)(inst->BitmapHeight) / 100.00f;
6868

6969
hdc = GetDC(hParentWnd);
70-
hdcg = CreateCompatibleDC(hdc);
71-
inst->hdcGraph = hdcg;
72-
inst->hbmGraph = CreateCompatibleBitmap(hdc, inst->BitmapWidth, inst->BitmapHeight);
73-
74-
if (!hdc ||
75-
!hdcg ||
76-
!inst->hbmGraph)
77-
{
70+
if (!hdc)
7871
goto fail;
79-
}
8072

73+
inst->hdcGraph = hdcg = CreateCompatibleDC(hdc);
74+
inst->hbmGraph = CreateCompatibleBitmap(hdc, inst->BitmapWidth, inst->BitmapHeight);
8175
ReleaseDC(hParentWnd, hdc);
76+
if (!hdcg || !inst->hbmGraph)
77+
goto fail;
78+
8279
hbmOld = (HBITMAP)SelectObject(hdcg, inst->hbmGraph);
8380
DeleteObject(hbmOld);
8481

‎base/applications/winhlp32/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11

22
add_definitions(
3-
-D__ROS_LONG64__
43
-Dstrcasecmp=_stricmp
54
)
65

‎base/applications/wordpad/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11

22
remove_definitions(-D_WIN32_IE=0x600)
3-
add_definitions(-D__ROS_LONG64__)
43

54
list(APPEND SOURCE
65
olecallback.c

‎base/setup/lib/muifonts.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ MUI_SUBFONT LatinFonts[] =
1717
{ L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" },
1818
{ L"Helv", L"MS Sans Serif" },
1919
{ L"Helvetica", L"Arial" },
20-
{ L"MS Sans Serif", L"Tahoma" },
21-
{ L"MS Shell Dlg", L"Tahoma" },
20+
{ L"MS Sans Serif", L"Microsoft Sans Serif" },
21+
{ L"MS Shell Dlg", L"Microsoft Sans Serif" },
2222
{ L"MS Shell Dlg 2", L"Tahoma" },
2323
{ L"Segoe UI Symbol", L"Arial" },
2424
{ L"System", L"FreeSans" },

0 commit comments

Comments
 (0)