September 2007 - Wine-commits

Mikolaj Zalewski : include: Fix the definition of VALID_INHERIT_FLAGS.
by Alexandre Julliard 26 Sep '07

26 Sep '07

Module: wine Branch: master Commit: f606055740fc560c73c04f3271bfec263292e4ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f606055740fc560c73c04f327… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Tue Sep 25 11:38:23 2007 -0700 include: Fix the definition of VALID_INHERIT_FLAGS. --- include/winnt.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 63b1936..aecc2af 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3917,7 +3917,7 @@ typedef struct _ACE_HEADER { #define NO_PROPAGATE_INHERIT_ACE 0x04 #define INHERIT_ONLY_ACE 0x08 #define INHERITED_ACE 0x10 -#define VALID_INHERIT_FLAGS 0x0F +#define VALID_INHERIT_FLAGS 0x1F /* AceFlags mask for what events we (should) audit */ #define SUCCESSFUL_ACCESS_ACE_FLAG 0x40

1 0

Mikolaj Zalewski : advapi32: Implement ConvertSecurityDescriptorToStringSecurityDescriptor[AW].
by Alexandre Julliard 26 Sep '07

26 Sep '07

Module: wine Branch: master Commit: 3198809fd52ca3605f455c1d9b199cbf36b517c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3198809fd52ca3605f455c1d9… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Tue Sep 25 13:12:50 2007 -0700 advapi32: Implement ConvertSecurityDescriptorToStringSecurityDescriptor[AW]. --- dlls/advapi32/advapi32.spec | 4 +- dlls/advapi32/security.c | 402 ++++++++++++++++++++++++++++++++++++++++ dlls/advapi32/tests/security.c | 101 ++++++++++ 3 files changed, 505 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3198809fd52ca3605f455…

1 0

Stefan Leichter : d3dxof: Remove 'recursive registry key delete' function.
by Alexandre Julliard 26 Sep '07

26 Sep '07

Module: wine Branch: master Commit: 4677e50a06426d80302b0149a5dae3be65d2fc84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4677e50a06426d80302b0149a… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Sep 25 17:03:24 2007 +0200 d3dxof: Remove 'recursive registry key delete' function. --- dlls/d3dxof/regsvr.c | 79 +++++-------------------------------------------- 1 files changed, 8 insertions(+), 71 deletions(-) diff --git a/dlls/d3dxof/regsvr.c b/dlls/d3dxof/regsvr.c index 7c90bd6..34c5827 100644 --- a/dlls/d3dxof/regsvr.c +++ b/dlls/d3dxof/regsvr.c @@ -118,9 +118,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -209,7 +206,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -316,16 +314,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -438,70 +439,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0

Stefan Leichter : comcat: Remove 'recursive registry key delete' function.
by Alexandre Julliard 26 Sep '07

26 Sep '07

Module: wine Branch: master Commit: 6be7eba918cacd60192fe612d9082ad18f6e88a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6be7eba918cacd60192fe612d… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Sep 25 17:21:51 2007 +0200 comcat: Remove 'recursive registry key delete' function. --- dlls/comcat/regsvr.c | 63 +++---------------------------------------------- 1 files changed, 4 insertions(+), 59 deletions(-) diff --git a/dlls/comcat/regsvr.c b/dlls/comcat/regsvr.c index 1a2bb68..21a7597 100644 --- a/dlls/comcat/regsvr.c +++ b/dlls/comcat/regsvr.c @@ -101,8 +101,6 @@ static LONG register_key_defvalueW(HKEY base, WCHAR const *name, WCHAR const *value); static LONG register_key_defvalueA(HKEY base, WCHAR const *name, char const *value); -static LONG recursive_delete_key(HKEY key); - /*********************************************************************** * register_interfaces @@ -189,22 +187,12 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) for (; res == ERROR_SUCCESS && list->iid; ++list) { WCHAR buf[39]; - HKEY iid_key; StringFromGUID2(list->iid, buf, 39); - res = RegOpenKeyExW(interface_key, buf, 0, - KEY_READ | KEY_WRITE, &iid_key); - if (res == ERROR_FILE_NOT_FOUND) { - res = ERROR_SUCCESS; - continue; - } - if (res != ERROR_SUCCESS) goto error_close_interface_key; - res = recursive_delete_key(iid_key); - RegCloseKey(iid_key); - if (res != ERROR_SUCCESS) goto error_close_interface_key; + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } -error_close_interface_key: RegCloseKey(interface_key); error_return: return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; @@ -287,23 +275,12 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) for (; res == ERROR_SUCCESS && list->clsid; ++list) { WCHAR buf[39]; - HKEY clsid_key; StringFromGUID2(list->clsid, buf, 39); - res = RegOpenKeyExW(coclass_key, buf, 0, - KEY_READ | KEY_WRITE, &clsid_key); - if (res == ERROR_FILE_NOT_FOUND) { - res = ERROR_SUCCESS; - continue; - } - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - res = recursive_delete_key(clsid_key); - RegCloseKey(clsid_key); - if (res != ERROR_SUCCESS) goto error_close_coclass_key; + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } -error_close_coclass_key: - RegCloseKey(coclass_key); error_return: return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; } @@ -360,38 +337,6 @@ static LONG register_key_defvalueA( } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0

Detlef Riekenberg : ntdll: Avoid segfault with snoop for exefiles with a broken export table.
by Alexandre Julliard 26 Sep '07

26 Sep '07

Module: wine Branch: master Commit: 3e83b750383e061fb1919bb79e57e20064a874f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e83b750383e061fb1919bb79… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 25 23:15:00 2007 +0200 ntdll: Avoid segfault with snoop for exefiles with a broken export table. --- dlls/ntdll/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 04172f9..6c1d7bc 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1444,7 +1444,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, } SERVER_END_REQ; - if (TRACE_ON(snoop)) SNOOP_SetupDLL( module ); + if ((wm->ldr.Flags & LDR_IMAGE_IS_DLL) && TRACE_ON(snoop)) SNOOP_SetupDLL( module ); TRACE_(loaddll)( " Loaded module %s : native\n", debugstr_w(wm->ldr.FullDllName.Buffer) );

1 0

Dmitry Timoshkov : user32: Make message test pass cleanly under XP SP2.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: d4193a94e4cd53c488fc920dc99f59462254ff06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4193a94e4cd53c488fc920dc… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 25 19:26:57 2007 +0900 user32: Make message test pass cleanly under XP SP2. --- dlls/user32/tests/msg.c | 123 +++++++++++++++++++++++++++++++--------------- 1 files changed, 83 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4193a94e4cd53c488fc9…

1 0

Philip Nilsson : ws2_32: Set IPV6_V6ONLY when required to be compatible with Windows.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: 1399a6eaf8a4185a5606be56f4d951725289b2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1399a6eaf8a4185a5606be56f… Author: Philip Nilsson <wine-devel(a)nullref.se> Date: Sat Sep 22 16:18:55 2007 +0200 ws2_32: Set IPV6_V6ONLY when required to be compatible with Windows. --- dlls/ws2_32/socket.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 13878a7..c517f7e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1405,6 +1405,20 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen) } else { +#ifdef IPV6_V6ONLY + const struct sockaddr_in6 *in6 = (const struct sockaddr_in6*) &uaddr; + if (name->sa_family == WS_AF_INET6 && + !memcmp(&in6->sin6_addr, &in6addr_any, sizeof(struct in6_addr))) + { + int enable = 1; + if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &enable, sizeof(enable)) == -1) + { + release_sock_fd( s, fd ); + SetLastError(WSAEAFNOSUPPORT); + return INVALID_SOCKET; + } + } +#endif if (bind(fd, &uaddr.addr, uaddrlen) < 0) { int loc_errno = errno;

1 0

Philip Nilsson : ws2_32/tests: Add a testcase for binding with IPv6 and IPv4 on the same port.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: 65dbd2b1140d397bfa658229ecf339ea7e7ca60c URL: http://source.winehq.org/git/wine.git/?a=commit;h=65dbd2b1140d397bfa658229e… Author: Philip Nilsson <wine-devel(a)nullref.se> Date: Sat Sep 22 16:19:18 2007 +0200 ws2_32/tests: Add a testcase for binding with IPv6 and IPv4 on the same port. --- dlls/ws2_32/tests/sock.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d04552e..8225f5f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1909,6 +1909,52 @@ end: CloseHandle(hEvent); } +static void test_ipv6only(void) +{ + SOCKET v4 = INVALID_SOCKET, + v6 = INVALID_SOCKET; + struct sockaddr_in sin4; + struct sockaddr_in6 sin6; + int ret; + + memset(&sin4, 0, sizeof(sin4)); + sin4.sin_family = AF_INET; + sin4.sin_port = htons(SERVERPORT); + + memset(&sin6, 0, sizeof(sin6)); + sin6.sin6_family = AF_INET6; + sin6.sin6_port = htons(SERVERPORT); + + v6 = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); + if (v6 == INVALID_SOCKET) { + skip("Could not create IPv6 socket (LastError: %d; %d expected if IPv6 not available).\n", + WSAGetLastError(), WSAEAFNOSUPPORT); + goto end; + } + ret = bind(v6, (struct sockaddr*)&sin6, sizeof(sin6)); + if (ret) { + skip("Could not bind IPv6 address (LastError: %d).\n", + WSAGetLastError()); + goto end; + } + + v4 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + if (v4 == INVALID_SOCKET) { + skip("Could not create IPv4 socket (LastError: %d).\n", + WSAGetLastError()); + goto end; + } + ret = bind(v4, (struct sockaddr*)&sin4, sizeof(sin4)); + ok(!ret, "Could not bind IPv4 address (LastError: %d; %d expected if IPv6 binds to IPv4 as well).\n", + WSAGetLastError(), WSAEADDRINUSE); + +end: + if (v4 != INVALID_SOCKET) + closesocket(v4); + if (v6 != INVALID_SOCKET) + closesocket(v6); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -1946,5 +1992,7 @@ START_TEST( sock ) test_send(); test_write_events(); + test_ipv6only(); + Exit(); }

1 0

Christian Gmeiner : advapi32: fix some compiler warnings when using -Wsign-compare.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: bb3a968d30b84995fbd347cbf825b61e2a865696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb3a968d30b84995fbd347cbf… Author: Christian Gmeiner <christian.gmeiner(a)gmail.com> Date: Fri Sep 21 20:17:23 2007 +0000 advapi32: fix some compiler warnings when using -Wsign-compare. --- dlls/advapi32/crypt.c | 2 +- dlls/advapi32/crypt_lmhash.c | 4 ++-- dlls/advapi32/security.c | 12 ++++++------ dlls/advapi32/service.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 63f89f6..c6ea940 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -146,7 +146,7 @@ static inline BOOL CRYPT_UnicodeToANSI(LPCWSTR wstr, LPSTR* str, int strsize) */ static inline BOOL CRYPT_ANSIToUnicode(LPCSTR str, LPWSTR* wstr, int wstrsize) { - int wcount; + unsigned int wcount; if (!str) { diff --git a/dlls/advapi32/crypt_lmhash.c b/dlls/advapi32/crypt_lmhash.c index 2f57842..345c89d 100644 --- a/dlls/advapi32/crypt_lmhash.c +++ b/dlls/advapi32/crypt_lmhash.c @@ -194,7 +194,7 @@ NTSTATUS WINAPI SystemFunction004(const struct ustring *in, unsigned int ui[2]; } data; unsigned char deskey[7]; - int crypt_len, ofs; + unsigned int crypt_len, ofs; if (key->Length<=0) return STATUS_INVALID_PARAMETER_2; @@ -253,7 +253,7 @@ NTSTATUS WINAPI SystemFunction005(const struct ustring *in, unsigned int ui[2]; } data; unsigned char deskey[7]; - int ofs, crypt_len; + unsigned int ofs, crypt_len; if (key->Length<=0) return STATUS_INVALID_PARAMETER_2; diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 89e3d90..bfe7edf 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -772,7 +772,7 @@ CreateWellKnownSid( WELL_KNOWN_SID_TYPE WellKnownSidType, PSID pSid, DWORD* cbSid) { - int i; + unsigned int i; TRACE("(%d, %s, %p, %p)\n", WellKnownSidType, debugstr_sid(DomainSid), pSid, cbSid); if (DomainSid != NULL) { @@ -811,7 +811,7 @@ CreateWellKnownSid( WELL_KNOWN_SID_TYPE WellKnownSidType, BOOL WINAPI IsWellKnownSid( PSID pSid, WELL_KNOWN_SID_TYPE WellKnownSidType ) { - int i; + unsigned int i; TRACE("(%s, %d)\n", debugstr_sid(pSid), WellKnownSidType); for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) @@ -1627,7 +1627,7 @@ LookupPrivilegeNameA( LPCSTR lpSystemName, PLUID lpLuid, LPSTR lpName, if (ret) { /* Windows crashes if cchName is NULL, so will I */ - int len = WideCharToMultiByte(CP_ACP, 0, lpNameW, -1, lpName, + unsigned int len = WideCharToMultiByte(CP_ACP, 0, lpNameW, -1, lpName, *cchName, NULL, NULL); if (len == 0) @@ -1870,7 +1870,7 @@ LookupAccountSidW( IN OUT LPDWORD domainSize, OUT PSID_NAME_USE name_use ) { - int i, j; + unsigned int i, j; const WCHAR * ac = NULL; const WCHAR * dm = NULL; SID_NAME_USE use = 0; @@ -3821,7 +3821,7 @@ static DWORD ComputeStringSidSize(LPCWSTR StringSid) } else /* String constant format - Only available in winxp and above */ { - int i; + unsigned int i; for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2)) @@ -3915,7 +3915,7 @@ static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes) } else /* String constant format - Only available in winxp and above */ { - int i; + unsigned int i; pisid->Revision = SDDL_REVISION; for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index ce031ab..82bd7ed 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2319,7 +2319,7 @@ BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, if (!RegOpenKeyW(hscm->hkey, lpServiceName, &hkey)) { - INT len = lstrlenW(lpServiceName); + UINT len = lstrlenW(lpServiceName); BOOL r = FALSE; if ((*lpcchBuffer <= len) || (!lpDisplayName && *lpcchBuffer))

1 0

Chris Robinson : wgl: Override glFinish and glFlush.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: 665a8add929d45c5a7d5de4023ea197f04acff9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=665a8add929d45c5a7d5de402… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Sep 22 20:45:27 2007 -0700 wgl: Override glFinish and glFlush. --- dlls/opengl32/make_opengl | 2 ++ dlls/opengl32/opengl_norm.c | 20 -------------------- dlls/opengl32/wgl.c | 22 ++++++++++++++++++++++ dlls/winex11.drv/opengl.c | 22 +++++++++++++++++++++- 4 files changed, 45 insertions(+), 21 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 381b1a9..b14b5cf 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -220,6 +220,8 @@ sub GenerateThunk($$$$$) return "" if $func_ref->[0] eq "glDisable"; return "" if $func_ref->[0] eq "glScissor"; return "" if $func_ref->[0] eq "glViewport"; + return "" if $func_ref->[0] eq "glFinish"; + return "" if $func_ref->[0] eq "glFlush"; # If for opengl_norm.c, generate a nice heading otherwise Patrik won't be happy :-) # Patrik says: Well I would be even happier if a (OPENGL32.@) was added as well. Done. :-) diff --git a/dlls/opengl32/opengl_norm.c b/dlls/opengl32/opengl_norm.c index 6534301..69acc85 100644 --- a/dlls/opengl32/opengl_norm.c +++ b/dlls/opengl32/opengl_norm.c @@ -1060,26 +1060,6 @@ void WINAPI wine_glFeedbackBuffer( GLsizei size, GLenum type, GLfloat* buffer ) } /*********************************************************************** - * glFinish (OPENGL32.@) - */ -void WINAPI wine_glFinish( void ) { - TRACE("()\n"); - ENTER_GL(); - glFinish( ); - LEAVE_GL(); -} - -/*********************************************************************** - * glFlush (OPENGL32.@) - */ -void WINAPI wine_glFlush( void ) { - TRACE("()\n"); - ENTER_GL(); - glFlush( ); - LEAVE_GL(); -} - -/*********************************************************************** * glFogf (OPENGL32.@) */ void WINAPI wine_glFogf( GLenum pname, GLfloat param ) { diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 029f361..deac8db 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -54,6 +54,8 @@ typedef struct wine_wgl_s { GLboolean WINAPI (*p_wglIsEnabled)(GLenum cap); void WINAPI (*p_wglScissor)(GLint x, GLint y, GLsizei width, GLsizei height); void WINAPI (*p_wglViewport)(GLint x, GLint y, GLsizei width, GLsizei height); + void WINAPI (*p_wglFinish)(void); + void WINAPI (*p_wglFlush)(void); } wine_wgl_t; /** global wgl object */ @@ -614,6 +616,24 @@ void WINAPI wine_glViewport( GLint x, GLint y, GLsizei width, GLsizei height ) } /*********************************************************************** + * glFinish (OPENGL32.@) + */ +void WINAPI wine_glFinish( void ) +{ + TRACE("()\n"); + wine_wgl.p_wglFinish(); +} + +/*********************************************************************** + * glFlush (OPENGL32.@) + */ +void WINAPI wine_glFlush( void ) +{ + TRACE("()\n"); + wine_wgl.p_wglFlush(); +} + +/*********************************************************************** * glGetString (OPENGL32.@) */ const GLubyte * WINAPI wine_glGetString( GLenum name ) @@ -705,6 +725,8 @@ static BOOL process_attach(void) wine_wgl.p_wglIsEnabled = (void *)wine_wgl.p_wglGetProcAddress("wglIsEnabled"); wine_wgl.p_wglScissor = (void *)wine_wgl.p_wglGetProcAddress("wglScissor"); wine_wgl.p_wglViewport = (void *)wine_wgl.p_wglGetProcAddress("wglViewport"); + wine_wgl.p_wglFinish = (void *)wine_wgl.p_wglGetProcAddress("wglFinish"); + wine_wgl.p_wglFlush = (void *)wine_wgl.p_wglGetProcAddress("wglFlush"); internal_gl_disabled_extensions[0] = 0; if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\OpenGL", &hkey)) { diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 091aee5..b867abd 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -72,7 +72,7 @@ typedef struct wine_glextension { struct { const char *funcName; void *funcAddress; - } extEntryPoints[8]; + } extEntryPoints[9]; } WineGLExtension; struct WineGLInfo { @@ -277,6 +277,8 @@ MAKE_FUNCPTR(glReadPixels) MAKE_FUNCPTR(glScissor) MAKE_FUNCPTR(glTexImage2D) MAKE_FUNCPTR(glViewport) +MAKE_FUNCPTR(glFinish) +MAKE_FUNCPTR(glFlush) #undef MAKE_FUNCPTR static BOOL X11DRV_WineGL_InitOpenglInfo(void) @@ -428,6 +430,8 @@ LOAD_FUNCPTR(glReadPixels) LOAD_FUNCPTR(glScissor) LOAD_FUNCPTR(glTexImage2D) LOAD_FUNCPTR(glViewport) +LOAD_FUNCPTR(glFinish) +LOAD_FUNCPTR(glFlush) #undef LOAD_FUNCPTR /* It doesn't matter if these fail. They'll only be used if the driver reports @@ -2054,6 +2058,20 @@ static void WINAPI X11DRV_wglViewport(GLint x, GLint y, GLsizei width, GLsizei h } } +static void WINAPI X11DRV_wglFinish(void) +{ + wine_tsx11_lock(); + pglFinish(); + wine_tsx11_unlock(); +} + +static void WINAPI X11DRV_wglFlush(void) +{ + wine_tsx11_lock(); + pglFlush(); + wine_tsx11_unlock(); +} + /** * X11DRV_wglGetExtensionsStringARB * @@ -3093,6 +3111,8 @@ static const WineGLExtension WGL_internal_functions = { "wglIsEnabled", X11DRV_wglIsEnabled }, { "wglScissor", X11DRV_wglScissor }, { "wglViewport", X11DRV_wglViewport }, + { "wglFinish", X11DRV_wglFinish }, + { "wglFlush", X11DRV_wglFlush }, } };

1 0