Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Yoann Laissus
wine
Commits
b4bb1f7d
Commit
b4bb1f7d
authored
24 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
Fixed progman internal dependencies and build it like the other
programs.
parent
80338d4a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
programs/progman/Makefile.in
+3
-22
3 additions, 22 deletions
programs/progman/Makefile.in
programs/progman/grpfile.c
+5
-4
5 additions, 4 deletions
programs/progman/grpfile.c
programs/progman/main.c
+3
-27
3 additions, 27 deletions
programs/progman/main.c
with
11 additions
and
53 deletions
programs/progman/Makefile.in
+
3
−
22
View file @
b4bb1f7d
DEFS
=
-DWINELIB
-DSTRICT
DEFS
=
-DSTRICT
TOPSRCDIR
=
@top_srcdir@
TOPSRCDIR
=
@top_srcdir@
TOPOBJDIR
=
../..
TOPOBJDIR
=
../..
SRCDIR
=
@srcdir@
SRCDIR
=
@srcdir@
VPATH
=
@srcdir@
VPATH
=
@srcdir@
MODULE
=
none
MODULE
=
progman
PROGRAMS
=
progman
IMPORTS
=
shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv user32 gdi32 kernel32 ntdll
LICENSELANG
=
En
LICENSELANG
=
En
...
@@ -19,25 +17,8 @@ C_SRCS = \
...
@@ -19,25 +17,8 @@ C_SRCS = \
string.c
\
string.c
\
$(
LICENSELANG:%
=
License_%.c
)
$(
LICENSELANG:%
=
License_%.c
)
SPEC_SRCS
=
progman.spec
RC_SRCS
=
rsrc.rc
RC_SRCS
=
rsrc.rc
all
:
$(PROGRAMS)
@MAKE_PROG_RULES@
@MAKE_RULES@
progman
:
$(OBJS)
$(
CC
)
-o
progman
$(
OBJS
)
$(
DLL_LINK
)
$(
LIBS
)
$(SPEC_SRCS
:
.spec=.spec.c): $(RC_SRCS:.rc=.res)
install
::
$(
INSTALL_PROGRAM
)
progman
$(
bindir
)
/progman
uninstall
::
$(
RM
)
$(
bindir
)
/progman
checklink
::
### Dependencies:
### Dependencies:
This diff is collapsed.
Click to expand it.
programs/progman/grpfile.c
+
5
−
4
View file @
b4bb1f7d
...
@@ -271,9 +271,9 @@ static HLOCAL GRPFILE_ScanProgram(LPCSTR buffer, INT size,
...
@@ -271,9 +271,9 @@ static HLOCAL GRPFILE_ScanProgram(LPCSTR buffer, INT size,
if
(
iconANDbits_ptr
+
iconANDsize
>
buffer
+
size
||
if
(
iconANDbits_ptr
+
iconANDsize
>
buffer
+
size
||
iconXORbits_ptr
+
iconXORsize
>
buffer
+
size
)
return
(
0
);
iconXORbits_ptr
+
iconXORsize
>
buffer
+
size
)
return
(
0
);
hIcon
=
Create
CursorIconIndirect16
(
Globals
.
hInstance
,
&
iconinfo
,
hIcon
=
Create
Icon
(
Globals
.
hInstance
,
iconinfo
.
nWidth
,
iconinfo
.
nHeight
,
(
LPSTR
)
iconANDbits_ptr
,
iconinfo
.
bPlanes
,
iconinfo
.
bBitsPerPixel
,
(
LPSTR
)
iconXORbits_ptr
);
iconANDbits_ptr
,
iconXORbits_ptr
);
lpszName
=
buffer
+
GET_USHORT
(
program_ptr
,
18
);
lpszName
=
buffer
+
GET_USHORT
(
program_ptr
,
18
);
lpszCmdLine
=
buffer
+
GET_USHORT
(
program_ptr
,
20
);
lpszCmdLine
=
buffer
+
GET_USHORT
(
program_ptr
,
20
);
...
@@ -635,7 +635,8 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group)
...
@@ -635,7 +635,8 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group)
LPVOID
XorBits
,
AndBits
;
LPVOID
XorBits
,
AndBits
;
INT
sizeXor
=
iconinfo
->
nHeight
*
iconinfo
->
nWidthBytes
;
INT
sizeXor
=
iconinfo
->
nHeight
*
iconinfo
->
nWidthBytes
;
INT
sizeAnd
=
iconinfo
->
nHeight
*
((
iconinfo
->
nWidth
+
15
)
/
16
*
2
);
INT
sizeAnd
=
iconinfo
->
nHeight
*
((
iconinfo
->
nWidth
+
15
)
/
16
*
2
);
DumpIcon16
(
LocalLock
(
program
->
hIcon
),
0
,
&
XorBits
,
&
AndBits
);
/* FIXME: this is broken anyway */
/* DumpIcon16(LocalLock(program->hIcon), 0, &XorBits, &AndBits);*/
PUT_SHORT
(
buffer
,
0
,
iconinfo
->
ptHotSpot
.
x
);
PUT_SHORT
(
buffer
,
0
,
iconinfo
->
ptHotSpot
.
x
);
PUT_SHORT
(
buffer
,
2
,
iconinfo
->
ptHotSpot
.
y
);
PUT_SHORT
(
buffer
,
2
,
iconinfo
->
ptHotSpot
.
y
);
...
...
This diff is collapsed.
Click to expand it.
programs/progman/main.c
+
3
−
27
View file @
b4bb1f7d
...
@@ -11,14 +11,8 @@
...
@@ -11,14 +11,8 @@
#include
"license.h"
#include
"license.h"
#include
"progman.h"
#include
"progman.h"
#ifdef WINELIB
#include
"options.h"
#endif
GLOBALS
Globals
;
GLOBALS
Globals
;
VOID
WINAPI
WriteOutProfiles16
(
void
);
static
VOID
MAIN_CreateGroups
(
void
);
static
VOID
MAIN_CreateGroups
(
void
);
static
VOID
MAIN_MenuCommand
(
HWND
hWnd
,
WPARAM
wParam
,
LPARAM
lParam
);
static
VOID
MAIN_MenuCommand
(
HWND
hWnd
,
WPARAM
wParam
,
LPARAM
lParam
);
static
ATOM
MAIN_RegisterMainWinClass
(
void
);
static
ATOM
MAIN_RegisterMainWinClass
(
void
);
...
@@ -37,26 +31,8 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show
...
@@ -37,26 +31,8 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show
{
{
MSG
msg
;
MSG
msg
;
#ifndef WINELIB
Globals
.
lpszIniFile
=
"progman.ini"
;
Globals
.
lpszIniFile
=
"progman.ini"
;
Globals
.
lpszIcoFile
=
"progman.ico"
;
Globals
.
lpszIcoFile
=
"progman.ico"
;
#else
/* Configuration in `wine.ini' */
{
CHAR
buffer
[
MAX_PATHNAME_LEN
],
*
p
;
/* Redirect `progman.ini' */
PROFILE_GetWineIniString
(
"progman"
,
"progman.ini"
,
"progman.ini"
,
buffer
,
sizeof
(
buffer
));
Globals
.
lpszIniFile
=
p
=
LocalLock
(
LocalAlloc
(
LMEM_FIXED
,
lstrlen
(
buffer
)
+
1
));
memcpy
(
p
,
buffer
,
1
+
lstrlen
(
buffer
));
/* Redirect `progman.ico' */
PROFILE_GetWineIniString
(
"progman"
,
"progman.ico"
,
"progman.ico"
,
buffer
,
sizeof
(
buffer
));
Globals
.
lpszIcoFile
=
p
=
LocalLock
(
LocalAlloc
(
LMEM_FIXED
,
lstrlen
(
buffer
)
+
1
));
memcpy
(
p
,
buffer
,
1
+
lstrlen
(
buffer
));
}
#endif
/* Select Language */
/* Select Language */
Globals
.
lpszLanguage
=
"En"
;
Globals
.
lpszLanguage
=
"En"
;
...
@@ -279,7 +255,7 @@ static VOID MAIN_MenuCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
...
@@ -279,7 +255,7 @@ static VOID MAIN_MenuCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
WritePrivateProfileString
(
"Settings"
,
"AutoArrange"
,
WritePrivateProfileString
(
"Settings"
,
"AutoArrange"
,
Globals
.
bAutoArrange
?
"1"
:
"0"
,
Globals
.
bAutoArrange
?
"1"
:
"0"
,
Globals
.
lpszIniFile
);
Globals
.
lpszIniFile
);
Write
OutProfiles16
();
Write
PrivateProfileString
(
NULL
,
NULL
,
NULL
,
Globals
.
lpszIniFile
);
/* flush it */
break
;
break
;
case
PM_MIN_ON_RUN
:
case
PM_MIN_ON_RUN
:
...
@@ -290,7 +266,7 @@ static VOID MAIN_MenuCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
...
@@ -290,7 +266,7 @@ static VOID MAIN_MenuCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
WritePrivateProfileString
(
"Settings"
,
"MinOnRun"
,
WritePrivateProfileString
(
"Settings"
,
"MinOnRun"
,
Globals
.
bMinOnRun
?
"1"
:
"0"
,
Globals
.
bMinOnRun
?
"1"
:
"0"
,
Globals
.
lpszIniFile
);
Globals
.
lpszIniFile
);
Write
OutProfiles16
();
Write
PrivateProfileString
(
NULL
,
NULL
,
NULL
,
Globals
.
lpszIniFile
);
/* flush it */
break
;
break
;
case
PM_SAVE_SETTINGS
:
case
PM_SAVE_SETTINGS
:
...
@@ -301,7 +277,7 @@ static VOID MAIN_MenuCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
...
@@ -301,7 +277,7 @@ static VOID MAIN_MenuCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
WritePrivateProfileString
(
"Settings"
,
"SaveSettings"
,
WritePrivateProfileString
(
"Settings"
,
"SaveSettings"
,
Globals
.
bSaveSettings
?
"1"
:
"0"
,
Globals
.
bSaveSettings
?
"1"
:
"0"
,
Globals
.
lpszIniFile
);
Globals
.
lpszIniFile
);
Write
OutProfiles16
();
Write
PrivateProfileString
(
NULL
,
NULL
,
NULL
,
Globals
.
lpszIniFile
);
/* flush it */
break
;
break
;
/* Menu Windows */
/* Menu Windows */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment