May 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : start: Build with msvcrt.
by Alexandre Julliard May 1, 2019

May 1, 2019

Module: wine Branch: master Commit: dae088939b8150d9f588d3ff9bbd75e24ce2780e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dae088939b8150d9f588d3ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 10:40:12 2019 +0200 start: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/Makefile.in | 3 ++- programs/start/start.c | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in index 168361d..d1ee667 100644 --- a/programs/start/Makefile.in +++ b/programs/start/Makefile.in @@ -1,7 +1,8 @@ MODULE = start.exe -APPMODE = -mconsole -municode IMPORTS = shell32 user32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = start.c RC_SRCS = start.rc diff --git a/programs/start/start.c b/programs/start/start.c index ccec9bc..18fd5f5 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -26,7 +26,6 @@ #include <shlobj.h> #include <shellapi.h> -#include <wine/unicode.h> #include <wine/debug.h> #include "resources.h" @@ -40,7 +39,7 @@ static void output(const WCHAR *message) { DWORD count; DWORD res; - int wlen = strlenW(message); + int wlen = lstrlenW(message); if (!wlen) return; @@ -131,8 +130,8 @@ static WCHAR *build_args( int argc, WCHAR **argvW ) for (i = 0; i < argc; i++ ) { - wlen += strlenW(argvW[i]) + 1; - if (strchrW(argvW[i], ' ')) + wlen += lstrlenW(argvW[i]) + 1; + if (wcschr(argvW[i], ' ')) wlen += 2; } ret = HeapAlloc( GetProcessHeap(), 0, wlen*sizeof(WCHAR) ); @@ -140,10 +139,10 @@ static WCHAR *build_args( int argc, WCHAR **argvW ) for (i = 0, p = ret; i < argc; i++ ) { - if (strchrW(argvW[i], ' ')) - p += sprintfW(p, FormatQuotesW, argvW[i]); + if (wcschr(argvW[i], ' ')) + p += swprintf(p, wlen - (p - ret), FormatQuotesW, argvW[i]); else - p += sprintfW(p, FormatW, argvW[i]); + p += swprintf(p, wlen - (p - ret), FormatW, argvW[i]); } return ret; } @@ -154,7 +153,7 @@ static WCHAR *get_parent_dir(WCHAR* path) WCHAR *result; int len; - last_slash = strrchrW( path, '\\' ); + last_slash = wcsrchr( path, '\\' ); if (last_slash == NULL) len = 1; else @@ -376,8 +375,9 @@ int wmain (int argc, WCHAR *argv[]) /* explorer on windows always quotes the filename when running a binary on windows (see bug 5224) so we have to use CreateProcessW in this case */ - commandline = HeapAlloc(GetProcessHeap(), 0, (strlenW(sei.lpFile)+3+strlenW(sei.lpParameters))*sizeof(WCHAR)); - sprintfW(commandline, commandlineformat, sei.lpFile, sei.lpParameters); + commandline = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(sei.lpFile)+3+lstrlenW(sei.lpParameters))*sizeof(WCHAR)); + swprintf(commandline, lstrlenW(sei.lpFile) + 3 + lstrlenW(sei.lpParameters), + commandlineformat, sei.lpFile, sei.lpParameters); ZeroMemory(&startup_info, sizeof(startup_info)); startup_info.cb = sizeof(startup_info); @@ -419,14 +419,14 @@ int wmain (int argc, WCHAR *argv[]) fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, sei.lpFile); GetEnvironmentVariableW(pathextW, env, size); - filename_len = strlenW(filename); + filename_len = lstrlenW(filename); name = HeapAlloc(GetProcessHeap(), 0, (filename_len + size) * sizeof(WCHAR)); if (!name) fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, sei.lpFile); sei.lpFile = name; start = env; - while ((ptr = strchrW(start, ';'))) + while ((ptr = wcschr(start, ';'))) { if (start == ptr) { @@ -434,7 +434,7 @@ int wmain (int argc, WCHAR *argv[]) continue; } - strcpyW(name, filename); + lstrcpyW(name, filename); memcpy(&name[filename_len], start, (ptr - start) * sizeof(WCHAR)); name[filename_len + (ptr - start)] = 0;

1 0

Alexandre Julliard : services: Build with msvcrt.
by Alexandre Julliard May 1, 2019

May 1, 2019

Module: wine Branch: master Commit: 32d7838da73dd9bc3ee999d73a310da7adfb27dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=32d7838da73dd9bc3ee999d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 10:40:06 2019 +0200 services: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/Makefile.in | 3 ++- programs/services/rpc.c | 51 +++++++++++++++++------------------ programs/services/services.c | 62 +++++++++++++++++++++---------------------- programs/services/utils.c | 5 ++-- 4 files changed, 60 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=32d7838da73dd9bc3ee9…

1 0

Alexandre Julliard : sc: Build with msvcrt.
by Alexandre Julliard May 1, 2019

May 1, 2019

Module: wine Branch: master Commit: a0863ce2e538538ccc5c056781742a9d6754a9a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0863ce2e538538ccc5c0567… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 10:39:55 2019 +0200 sc: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/sc/Makefile.in | 3 +- programs/sc/sc.c | 92 ++++++++++++++++++++++++------------------------- 2 files changed, 47 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a0863ce2e538538ccc5c…

1 0

Alexandre Julliard : uninstaller: Build with msvcrt.
by Alexandre Julliard May 1, 2019

May 1, 2019

Module: wine Branch: master Commit: 01db71e4e4bf504ad137c3d5dea397088626a3b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01db71e4e4bf504ad137c3d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 10:40:32 2019 +0200 uninstaller: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/uninstaller/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in index c6ba39f..146e620 100644 --- a/programs/uninstaller/Makefile.in +++ b/programs/uninstaller/Makefile.in @@ -1,8 +1,9 @@ MODULE = uninstaller.exe -APPMODE = -mconsole -municode IMPORTS = advapi32 DELAYIMPORTS = shlwapi shell32 user32 gdi32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ main.c

1 0

Qian Hong : server: Create primary group using DOMAIN_GROUP_RID_USERS.
by Alexandre Julliard May 1, 2019

May 1, 2019

Module: wine Branch: master Commit: 1058647e14145af4368c6d8e483c28d7740fb15f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1058647e14145af4368c6d8e… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat Apr 27 11:20:03 2019 +0200 server: Create primary group using DOMAIN_GROUP_RID_USERS. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 2 +- server/token.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a220147..aee4587 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3016,7 +3016,7 @@ static void test_process_security(void) ok(res, "GetTokenInformation failed with error %d\n", GetLastError()); UserSid = user->User.Sid; test_sid_str(UserSid); - todo_wine ok(EqualPrefixSid(UsersSid, UserSid), "TokenPrimaryGroup Sid and TokenUser Sid don't match.\n"); + ok(EqualPrefixSid(UsersSid, UserSid), "TokenPrimaryGroup Sid and TokenUser Sid don't match.\n"); CloseHandle( token ); if (!res) diff --git a/server/token.c b/server/token.c index 895809e..e0f28c6 100644 --- a/server/token.c +++ b/server/token.c @@ -839,6 +839,7 @@ struct token *token_create_admin( void ) { security_local_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, { security_interactive_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, { security_authenticated_user_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, + { security_domain_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER }, { alias_admins_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER }, { alias_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, { logon_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_LOGON_ID },

1 0

Tim Schumacher : winejoystick: Add support for wheel axes.
by Alexandre Julliard May 1, 2019

May 1, 2019

Module: wine Branch: master Commit: 905e7b0e2ef99c7ccfa5a3dda0844d5ea40afc77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=905e7b0e2ef99c7ccfa5a3dd… Author: Tim Schumacher <timschumi(a)gmx.de> Date: Sun Mar 31 13:02:27 2019 +0200 winejoystick: Add support for wheel axes. Wheel, gas, and brake are replacements for X, Y and Z in wheel-like joysticks. Remap them internally to send inputs as X, Y, and Z. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_linux.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c index 85ad2fe..8d1a7b1 100644 --- a/dlls/winejoystick.drv/joystick_linux.c +++ b/dlls/winejoystick.drv/joystick_linux.c @@ -270,10 +270,13 @@ LRESULT driver_joyGetDevCaps(DWORD_PTR dwDevID, LPJOYCAPSW lpCaps, DWORD dwSize) switch (jstck->axesMap[i]) { case 0: /* X */ case 1: /* Y */ + case 8: /* Wheel */ + case 9: /* Gas */ lpCaps->wNumAxes++; break; case 2: /* Z */ case 6: /* Throttle */ + case 10: /* Brake */ lpCaps->wNumAxes++; lpCaps->wCaps |= JOYCAPS_HASZ; break; @@ -322,13 +325,16 @@ LRESULT driver_joyGetPosEx(DWORD_PTR dwDevID, LPJOYINFOEX lpInfo) if (ev.type == (JS_EVENT_AXIS)) { switch (jstck->axesMap[ev.number]) { case 0: /* X */ + case 8: /* Wheel */ jstck->x = ev.value; break; case 1: /* Y */ + case 9: /* Gas */ jstck->y = ev.value; break; case 2: /* Z */ case 6: /* Throttle */ + case 10: /* Brake */ jstck->z = ev.value; break; case 5: /* Rz */

1 0

Tim Schumacher : dinput: Map wheel, gas, and brake axes as well.
by Alexandre Julliard May 1, 2019

May 1, 2019

Module: wine Branch: master Commit: 1a6458bad8191a8188d76ba21b38ef457bfe1295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a6458bad8191a8188d76ba2… Author: Tim Schumacher <timschumi(a)gmx.de> Date: Sun Mar 31 13:09:43 2019 +0200 dinput: Map wheel, gas, and brake axes as well. The axes wheel, gas, and brake are just differently named replacements for X, Y, and Z when using wheel-like joysticks. Make those accessible by remapping them to X, Y, and Z internally. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 736a06e..f93fc2f 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -239,6 +239,14 @@ static INT find_joystick_devices(void) joydev.dev_axes_map[j] = j; found_axes++; } + else if (axes_map[j] <= 10) + { + /* Axes 8 through 10 are Wheel, Gas and Brake, + * remap to 0, 1 and 2 + */ + joydev.dev_axes_map[j] = axes_map[j] - 8; + found_axes++; + } else if (axes_map[j] == 16 || axes_map[j] == 17) {

1 0

Erich E. Hoover : kernel32: Add SearchPath test demonstrating the priority of the working directory.
by Alexandre Julliard May 1, 2019

May 1, 2019

Module: wine Branch: master Commit: 690a9003b353210696c6da685285a5e6400d2f09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=690a9003b353210696c6da68… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Apr 17 10:56:27 2019 +0200 kernel32: Add SearchPath test demonstrating the priority of the working directory. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 0a03225..8f55083 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1820,10 +1820,11 @@ static void test_SearchPathA(void) static const CHAR testdeprelA[] = "./testdep.dll"; static const CHAR kernel32A[] = "kernel32.dll"; static const CHAR fileA[] = ""; - CHAR pathA[MAX_PATH], buffA[MAX_PATH], path2A[MAX_PATH]; - CHAR *ptrA = NULL; + CHAR pathA[MAX_PATH], buffA[MAX_PATH], path2A[MAX_PATH], path3A[MAX_PATH], curdirA[MAX_PATH]; + CHAR tmpdirA[MAX_PATH], *ptrA = NULL; ULONG_PTR cookie; HANDLE handle; + BOOL bret; DWORD ret; GetWindowsDirectoryA(pathA, ARRAY_SIZE(pathA)); @@ -1915,6 +1916,28 @@ static void test_SearchPathA(void) ret = pDeactivateActCtx(0, cookie); ok(ret, "failed to deactivate context, %u\n", GetLastError()); pReleaseActCtx(handle); + + /* test the search path priority of the working directory */ + GetTempPathA(sizeof(tmpdirA), tmpdirA); + ret = GetCurrentDirectoryA(MAX_PATH, curdirA); + ok(ret, "failed to obtain working directory.\n"); + sprintf(pathA, "%s\\%s", tmpdirA, kernel32A); + ret = SearchPathA(NULL, kernel32A, NULL, sizeof(path2A)/sizeof(CHAR), path2A, NULL); + ok(ret && ret == strlen(path2A), "got %d\n", ret); + bret = CopyFileA(path2A, pathA, FALSE); + ok(bret != 0, "failed to copy test executable to temp directory, %u\n", GetLastError()); + sprintf(path3A, "%s%s%s", curdirA, curdirA[strlen(curdirA)-1] != '\\' ? "\\" : "", kernel32A); + bret = CopyFileA(path2A, path3A, FALSE); + ok(bret != 0, "failed to copy test executable to launch directory, %u\n", GetLastError()); + bret = SetCurrentDirectoryA(tmpdirA); + ok(bret, "failed to change working directory\n"); + ret = SearchPathA(NULL, kernel32A, ".exe", sizeof(buffA), buffA, NULL); + ok(ret && ret == strlen(buffA), "got %d\n", ret); + ok(strcmp(buffA, path3A) == 0, "expected %s, got %s\n", path3A, buffA); + bret = SetCurrentDirectoryA(curdirA); + ok(bret, "failed to reset working directory\n"); + DeleteFileA(path3A); + DeleteFileA(pathA); } static void test_SearchPathW(void)

1 0

Alexandre Julliard : makefiles: Don't use custom LDFLAGS to link dlls.
by Alexandre Julliard May 1, 2019

May 1, 2019

Module: wine Branch: master Commit: 21e1018ebdbe3d7d1b3f657c14105f8e6ce67474 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21e1018ebdbe3d7d1b3f657c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 17:40:33 2019 +0200 makefiles: Don't use custom LDFLAGS to link dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index f5c5e0a..b932b9c 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2945,7 +2945,6 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, output_filename( source->filename ); output_filename( obj_name ); output_filenames( all_libs ); - output_filename( "$(LDFLAGS)" ); output( "\n" ); } @@ -3171,7 +3170,6 @@ static void output_module( struct makefile *make ) output_filenames_obj_dir( make, need_cross ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); - output_filename( "$(LDFLAGS)" ); output( "\n" ); if (spec_file && make->importlib) @@ -3320,7 +3318,6 @@ static void output_test_module( struct makefile *make ) output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); - output_filename( "$(LDFLAGS)" ); output( "\n" ); output( "%s%s:\n", obj_dir_path( make, stripped ), ext ); output_winegcc_command( make, !!crosstarget ); @@ -3330,7 +3327,6 @@ static void output_test_module( struct makefile *make ) output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); - output_filename( "$(LDFLAGS)" ); output( "\n" ); output( "%s%s %s%s:", obj_dir_path( make, testmodule ), ext, obj_dir_path( make, stripped ), ext ); output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files );

1 0

Alexandre Julliard : include: Add DECLSPEC_IMPORT on OpenGL functions when not building opengl32.
by Alexandre Julliard May 1, 2019

May 1, 2019

Module: wine Branch: master Commit: 8a576c9906a61f1441e8aacda1fecc30c2d4d7b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a576c9906a61f1441e8aacd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 20:59:11 2019 +0200 include: Add DECLSPEC_IMPORT on OpenGL functions when not building opengl32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/Makefile.in | 1 + include/wingdi.h | 46 ++++++++++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in index 3b1293e..196bb5d 100644 --- a/dlls/opengl32/Makefile.in +++ b/dlls/opengl32/Makefile.in @@ -1,4 +1,5 @@ MODULE = opengl32.dll +EXTRADEFS = -D_OPENGL32_ IMPORTLIB = opengl32 IMPORTS = user32 gdi32 advapi32 DELAYIMPORTS = glu32 diff --git a/include/wingdi.h b/include/wingdi.h index 01d3ff3..347ce1a 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -30,6 +30,12 @@ extern "C" { #define WINGDIAPI DECLSPEC_IMPORT #endif +#ifdef _OPENGL32_ +#define WGLAPI +#else +#define WGLAPI DECLSPEC_IMPORT +#endif + typedef struct _ABCFLOAT { FLOAT abcfA; FLOAT abcfB; @@ -3994,26 +4000,26 @@ WINGDIAPI BOOL WINAPI PolyTextOutW(HDC,const POLYTEXTW*,INT); #define WGL_FONT_POLYGONS 1 /* WGL prototypes */ -WINGDIAPI HGLRC WINAPI wglCreateContext(HDC); -WINGDIAPI HGLRC WINAPI wglCreateLayerContext(HDC,INT); -WINGDIAPI BOOL WINAPI wglCopyContext(HGLRC,HGLRC,UINT); -WINGDIAPI BOOL WINAPI wglDeleteContext(HGLRC); -WINGDIAPI BOOL WINAPI wglDescribeLayerPlane(HDC,INT,INT,UINT,LPLAYERPLANEDESCRIPTOR); -WINGDIAPI HGLRC WINAPI wglGetCurrentContext(void); -WINGDIAPI HDC WINAPI wglGetCurrentDC(void); -WINGDIAPI INT WINAPI wglGetLayerPaletteEntries(HDC,INT,INT,INT,const COLORREF *); -WINGDIAPI PROC WINAPI wglGetProcAddress(LPCSTR); -WINGDIAPI BOOL WINAPI wglMakeCurrent(HDC,HGLRC); -WINGDIAPI BOOL WINAPI wglRealizeLayerPalette(HDC,INT,BOOL); -WINGDIAPI INT WINAPI wglSetLayerPaletteEntries(HDC,INT,INT,INT,const COLORREF *); -WINGDIAPI BOOL WINAPI wglShareLists(HGLRC,HGLRC); -WINGDIAPI BOOL WINAPI wglSwapLayerBuffers(HDC,UINT); -WINGDIAPI BOOL WINAPI wglUseFontBitmapsA(HDC,DWORD,DWORD,DWORD); -WINGDIAPI BOOL WINAPI wglUseFontBitmapsW(HDC,DWORD,DWORD,DWORD); -#define wglUseFontBitmaps WINELIB_NAME_AW(wglUseFontBitmaps) -WINGDIAPI BOOL WINAPI wglUseFontOutlinesA(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); -WINGDIAPI BOOL WINAPI wglUseFontOutlinesW(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); -#define wglUseFontOutlines WINELIB_NAME_AW(wglUseFontOutlines) +WGLAPI HGLRC WINAPI wglCreateContext(HDC); +WGLAPI HGLRC WINAPI wglCreateLayerContext(HDC,INT); +WGLAPI BOOL WINAPI wglCopyContext(HGLRC,HGLRC,UINT); +WGLAPI BOOL WINAPI wglDeleteContext(HGLRC); +WGLAPI BOOL WINAPI wglDescribeLayerPlane(HDC,INT,INT,UINT,LPLAYERPLANEDESCRIPTOR); +WGLAPI HGLRC WINAPI wglGetCurrentContext(void); +WGLAPI HDC WINAPI wglGetCurrentDC(void); +WGLAPI INT WINAPI wglGetLayerPaletteEntries(HDC,INT,INT,INT,const COLORREF *); +WGLAPI PROC WINAPI wglGetProcAddress(LPCSTR); +WGLAPI BOOL WINAPI wglMakeCurrent(HDC,HGLRC); +WGLAPI BOOL WINAPI wglRealizeLayerPalette(HDC,INT,BOOL); +WGLAPI INT WINAPI wglSetLayerPaletteEntries(HDC,INT,INT,INT,const COLORREF *); +WGLAPI BOOL WINAPI wglShareLists(HGLRC,HGLRC); +WGLAPI BOOL WINAPI wglSwapLayerBuffers(HDC,UINT); +WGLAPI BOOL WINAPI wglUseFontBitmapsA(HDC,DWORD,DWORD,DWORD); +WGLAPI BOOL WINAPI wglUseFontBitmapsW(HDC,DWORD,DWORD,DWORD); +#define wglUseFontBitmaps WINELIB_NAME_AW(wglUseFontBitmaps) +WGLAPI BOOL WINAPI wglUseFontOutlinesA(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); +WGLAPI BOOL WINAPI wglUseFontOutlinesW(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); +#define wglUseFontOutlines WINELIB_NAME_AW(wglUseFontOutlines) #ifdef __cplusplus }

1 0