Skip to content

Commit

Permalink
Implement Diablo UI code (#206)
Browse files Browse the repository at this point in the history
  • Loading branch information
@galaxyhaxz
galaxyhaxz authored Sep 16, 2018
1 parent a3800a3 commit 05b1f90
Show file tree
Hide file tree
Showing 30 changed files with 1,384 additions and 443 deletions.
11 changes: 6 additions & 5 deletions 3rdParty/Storm/Source/Storm.dsp
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions 3rdParty/Storm/Source/storm.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,3 +236,9 @@ bool __stdcall SNetSetBasePlayer(int) rBool;
int __stdcall SNetInitializeProvider(unsigned long,struct _SNETPROGRAMDATA *,struct _SNETPLAYERDATA *,struct _SNETUIDATA *,struct _SNETVERSIONDATA *) rInt;
int __stdcall SNetGetProviderCaps(struct _SNETCAPS *) rInt;
int __stdcall SFileSetFilePointer(HANDLE,int,HANDLE,int) rInt;
void __stdcall SDrawClearSurface(int a1) rVoid;
BOOL __stdcall SDlgSetBitmapI(HWND hWnd, int a2, char *src, int mask1, int flags, void *pBuff, int a7, int width, int height, int mask2) rBool;
void __stdcall SDlgBeginPaint(HWND hWnd, char *a2) rVoid;
void __stdcall SDlgEndPaint(HWND hWnd, char *a2) rVoid;
void __stdcall SDlgSetSystemCursor(BYTE *a1, BYTE *a2, int *a3, int a4) rVoid;
void __stdcall SDlgSetCursor(HWND hWnd, HCURSOR a2, int a3, int *a4) rVoid;
12 changes: 6 additions & 6 deletions 3rdParty/Storm/Source/storm.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ EXPORTS
;Ordinal150 @150 NONAME
;Ordinal151 @151 NONAME

;SDlgBeginPaint @201 NONAME
SDlgBeginPaint @201 NONAME
;SDlgBltToWindowI @202 NONAME
;SDlgCheckTimers @203 NONAME
;SDlgCreateDialogIndirectParam @204 NONAME
Expand All @@ -62,13 +62,13 @@ EXPORTS
;SDlgDialogBoxParam @209 NONAME
;SDlgDrawBitmap @210 NONAME
SDlgEndDialog @211 NONAME
;SDlgEndPaint @212 NONAME
SDlgEndPaint @212 NONAME
;SDlgKillTimer @213 NONAME
;SDlgSetBaseFont @214 NONAME
;SDlgSetBitmapI @215 NONAME
SDlgSetBitmapI @215 NONAME
SDlgSetControlBitmaps @216 NONAME
;SDlgSetCursor @217 NONAME
;SDlgSetSystemCursor @218 NONAME
SDlgSetCursor @217 NONAME
SDlgSetSystemCursor @218 NONAME
;SDlgSetTimer @219 NONAME
;SDlgUpdateCursor @220 NONAME
SDlgBltToWindowE @221 NONAME
Expand Down Expand Up @@ -151,7 +151,7 @@ EXPORTS

SDrawAutoInitialize @341 NONAME
SDrawCaptureScreen @342 NONAME
;SDrawClearSurface @343 NONAME
SDrawClearSurface @343 NONAME
SDrawDestroy @344 NONAME
;SDrawFlipPage @345 NONAME
SDrawGetFrameWindow @346 NONAME
Expand Down
6 changes: 6 additions & 0 deletions 3rdParty/Storm/Source/storm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1299,6 +1299,12 @@ bool __stdcall SNetSetBasePlayer(int);
int __stdcall SNetInitializeProvider(unsigned long,struct _SNETPROGRAMDATA *,struct _SNETPLAYERDATA *,struct _SNETUIDATA *,struct _SNETVERSIONDATA *);
int __stdcall SNetGetProviderCaps(struct _SNETCAPS *);
int __stdcall SFileSetFilePointer(HANDLE,int,HANDLE,int);
void __stdcall SDrawClearSurface(int a1);
BOOL __stdcall SDlgSetBitmapI(HWND hWnd, int a2, char *src, int mask1, int flags, void *pBuff, int a7, int width, int height, int mask2);
void __stdcall SDlgBeginPaint(HWND hWnd, char *a2);
void __stdcall SDlgEndPaint(HWND hWnd, char *a2);
void __stdcall SDlgSetSystemCursor(BYTE *a1, BYTE *a2, int *a3, int a4);
void __stdcall SDlgSetCursor(HWND hWnd, HCURSOR a2, int a3, int *a4);

#ifdef __GNUC__
}
Expand Down
18 changes: 12 additions & 6 deletions 3rdParty/Storm/Source/storm_gcc.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ EXPORTS
;Ordinal150 @150 NONAME
;Ordinal151 @151 NONAME

;SDlgBeginPaint @201 NONAME
SDlgBeginPaint @201 NONAME
SDlgBeginPaint@8 @201 NONAME
;SDlgBltToWindowI @202 NONAME
;SDlgCheckTimers @203 NONAME
;SDlgCreateDialogIndirectParam @204 NONAME
Expand All @@ -80,13 +81,17 @@ EXPORTS
;SDlgDialogBoxParam @209 NONAME
;SDlgDrawBitmap @210 NONAME
SDlgEndDialog @211 NONAME
;SDlgEndPaint @212 NONAME
SDlgEndPaint @212 NONAME
SDlgEndPaint@8 @212 NONAME
;SDlgKillTimer @213 NONAME
;SDlgSetBaseFont @214 NONAME
;SDlgSetBitmapI @215 NONAME
SDlgSetBitmapI @215 NONAME
SDlgSetBitmapI@40 @215 NONAME
SDlgSetControlBitmaps @216 NONAME
;SDlgSetCursor @217 NONAME
;SDlgSetSystemCursor @218 NONAME
SDlgSetCursor @217 NONAME
SDlgSetCursor@16 @217 NONAME
SDlgSetSystemCursor @218 NONAME
SDlgSetSystemCursor@16 @218 NONAME
;SDlgSetTimer @219 NONAME
;SDlgUpdateCursor @220 NONAME
SDlgBltToWindowE @221 NONAME
Expand Down Expand Up @@ -185,7 +190,8 @@ EXPORTS

SDrawAutoInitialize @341 NONAME
SDrawCaptureScreen @342 NONAME
;SDrawClearSurface @343 NONAME
SDrawClearSurface @343 NONAME
SDrawClearSurface@0 @343 NONAME
SDrawDestroy @344 NONAME
;SDrawFlipPage @345 NONAME
SDrawGetFrameWindow @346 NONAME
Expand Down
11 changes: 6 additions & 5 deletions Diablo.dsp
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion Diablo.dsw
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Microsoft Developer Studio Workspace File, Format Version 5.00
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

###############################################################################
Expand Down Expand Up @@ -29,6 +29,9 @@ Package=<5>

Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name Storm
End Project Dependency
}}}

###############################################################################
Expand Down
18 changes: 9 additions & 9 deletions DiabloUI/DiabloUI.dsp
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions DiabloUI/DiabloUI.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<ModuleDefinitionFile>diabloui.def</ModuleDefinitionFile>
<OutputFile>.\WinRel\DiabloUI.dll</OutputFile>
<ImportLibrary>.\WinRel\DiabloUI.lib</ImportLibrary>
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>../3rdParty/Storm/Source/WinRel/Storm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
Expand Down Expand Up @@ -128,7 +128,7 @@
<ModuleDefinitionFile>diabloui.def</ModuleDefinitionFile>
<OutputFile>.\WinDebug\DiabloUI.dll</OutputFile>
<ImportLibrary>.\WinDebug\DiabloUI.lib</ImportLibrary>
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>../3rdParty/Storm/Source/WinDebug/Storm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand All @@ -143,4 +143,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
Loading

0 comments on commit 05b1f90

Please sign in to comment.