January 2010 - Wine-Commits

Jacek Caban : urlmon: Fixed accept_mimes freeing.
by Alexandre Julliard Jan. 5, 2010

Jan. 5, 2010

Module: wine Branch: master Commit: 367cca6a9f6a34c78c8a3bd1401c64bc6a5fa862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=367cca6a9f6a34c78c8a3bd14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 4 19:16:20 2010 +0100 urlmon: Fixed accept_mimes freeing. --- dlls/urlmon/http.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 15344e2..fc0b8c4 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -79,7 +79,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ URL_COMPONENTSW url_comp; BYTE security_id[512]; DWORD len = 0; - ULONG num = 0; + ULONG num; BOOL res, b; HRESULT hres; @@ -132,8 +132,8 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ ? wszBindVerb[This->base.bind_info.dwBindVerb] : This->base.bind_info.szCustomVerb, path, NULL, NULL, (LPCWSTR *)accept_mimes, request_flags, (DWORD_PTR)&This->base); heap_free(path); - while (num<sizeof(accept_mimes)/sizeof(accept_mimes[0]) && accept_mimes[num]) - CoTaskMemFree(accept_mimes[num++]); + while(num--) + CoTaskMemFree(accept_mimes[num]); if (!This->base.request) { WARN("HttpOpenRequest failed: %d\n", GetLastError()); return INET_E_RESOURCE_NOT_FOUND;

1 0

Alexandre Julliard : Update copyright info for 2010.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: f74e312bf81032c46bd2ce080a5f6a33c7ac3ee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f74e312bf81032c46bd2ce080… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 17:09:21 2010 +0100 Update copyright info for 2010. --- LICENSE | 2 +- include/wine/wine_common_ver.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index d6844a6..c9549e3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2009 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2010 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 6d6cf92..29dcd98 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -104,7 +104,7 @@ FILESUBTYPE WINE_FILESUBTYPE VALUE "FileDescription", WINE_FILEDESCRIPTION_STR VALUE "FileVersion", WINE_FILEVERSION_STR VALUE "InternalName", WINE_FILENAME - VALUE "LegalCopyright", "Copyright (c) 1993-2009 the Wine project authors (see the file AUTHORS for a complete list)" + VALUE "LegalCopyright", "Copyright (c) 1993-2010 the Wine project authors (see the file AUTHORS for a complete list)" VALUE "OriginalFilename", WINE_FILENAME_STR VALUE "ProductName", WINE_PRODUCTNAME_STR VALUE "ProductVersion", WINE_PRODUCTVERSION_STR

1 0

Maarten Lankhorst : mmdevapi: Add stubs for MMDevEnum with tests.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: 3410ab8b7ce434bfbccb1429c0d802c2e53bb8ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=3410ab8b7ce434bfbccb1429c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Dec 14 16:04:04 2009 +0100 mmdevapi: Add stubs for MMDevEnum with tests. --- dlls/mmdevapi/devenum.c | 122 ++++++++++++++++++++++++++++++++++++++- dlls/mmdevapi/main.c | 1 + dlls/mmdevapi/mmdevapi.h | 1 + dlls/mmdevapi/tests/mmdevenum.c | 19 ++++++- 4 files changed, 140 insertions(+), 3 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index e34c824..90347b1 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -33,8 +33,128 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); +typedef struct MMDevEnumImpl +{ + IMMDeviceEnumeratorVtbl *lpVtbl; + LONG ref; +} MMDevEnumImpl; + +static MMDevEnumImpl *MMDevEnumerator; +static IMMDeviceEnumeratorVtbl MMDevEnumVtbl; + HRESULT MMDevEnum_Create(REFIID riid, void **ppv) { + MMDevEnumImpl *This = MMDevEnumerator; + + if (!This) + { + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + *ppv = NULL; + if (!This) + return E_OUTOFMEMORY; + This->ref = 1; + This->lpVtbl = &MMDevEnumVtbl; + MMDevEnumerator = This; + } + return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); +} + +void MMDevEnum_Free(void) +{ + HeapFree(GetProcessHeap(), 0, MMDevEnumerator); + MMDevEnumerator = NULL; +} + +static HRESULT WINAPI MMDevEnum_QueryInterface(IMMDeviceEnumerator *iface, REFIID riid, void **ppv) +{ + MMDevEnumImpl *This = (MMDevEnumImpl*)iface; + + if (!ppv) + return E_POINTER; + if (IsEqualIID(riid, &IID_IUnknown) + || IsEqualIID(riid, &IID_IMMDeviceEnumerator)) + *ppv = This; + else + *ppv = NULL; + if (!*ppv) + return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI MMDevEnum_AddRef(IMMDeviceEnumerator *iface) +{ + MMDevEnumImpl *This = (MMDevEnumImpl*)iface; + LONG ref = InterlockedIncrement(&This->ref); + TRACE("Refcount now %i\n", ref); + return ref; +} + +static ULONG WINAPI MMDevEnum_Release(IMMDeviceEnumerator *iface) +{ + MMDevEnumImpl *This = (MMDevEnumImpl*)iface; + LONG ref = InterlockedDecrement(&This->ref); + if (!ref) + MMDevEnum_Free(); + TRACE("Refcount now %i\n", ref); + return ref; +} + +static HRESULT WINAPI MMDevEnum_EnumAudioEndpoints(IMMDeviceEnumerator *iface, EDataFlow flow, DWORD mask, IMMDeviceCollection **devices) +{ + MMDevEnumImpl *This = (MMDevEnumImpl*)iface; + TRACE("(%p)->(%u,%u,%p)\n", This, flow, mask, devices); + if (!devices) + return E_POINTER; + *devices = NULL; + if (flow >= EDataFlow_enum_count) + return E_INVALIDARG; + if (mask & ~DEVICE_STATEMASK_ALL) + return E_INVALIDARG; + FIXME("stub\n"); + return E_NOTFOUND; +} + +static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *iface, EDataFlow flow, ERole role, IMMDevice **device) +{ + MMDevEnumImpl *This = (MMDevEnumImpl*)iface; + TRACE("(%p)->(%u,%u,%p)\n", This, flow, role, device); FIXME("stub\n"); - return CLASS_E_CLASSNOTAVAILABLE; + return E_NOTFOUND; } + +static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHAR *name, IMMDevice **device) +{ + MMDevEnumImpl *This = (MMDevEnumImpl*)iface; + TRACE("(%p)->(%s,%p)\n", This, debugstr_w(name), device); + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI MMDevEnum_RegisterEndpointNotificationCallback(IMMDeviceEnumerator *iface, IMMNotificationClient *client) +{ + MMDevEnumImpl *This = (MMDevEnumImpl*)iface; + TRACE("(%p)->(%p)\n", This, client); + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI MMDevEnum_UnregisterEndpointNotificationCallback(IMMDeviceEnumerator *iface, IMMNotificationClient *client) +{ + MMDevEnumImpl *This = (MMDevEnumImpl*)iface; + TRACE("(%p)->(%p)\n", This, client); + FIXME("stub\n"); + return E_NOTIMPL; +} + +static IMMDeviceEnumeratorVtbl MMDevEnumVtbl = +{ + MMDevEnum_QueryInterface, + MMDevEnum_AddRef, + MMDevEnum_Release, + MMDevEnum_EnumAudioEndpoints, + MMDevEnum_GetDefaultAudioEndpoint, + MMDevEnum_GetDevice, + MMDevEnum_RegisterEndpointNotificationCallback, + MMDevEnum_UnregisterEndpointNotificationCallback +}; diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index d167d80..df5f9e7 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -44,6 +44,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) DisableThreadLibraryCalls(hinstDLL); break; case DLL_PROCESS_DETACH: + MMDevEnum_Free(); break; } diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index e6b878a..bab3af5 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -17,3 +17,4 @@ */ extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv); +extern void MMDevEnum_Free(void); diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 5ebd32a..06c106f 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -26,6 +26,8 @@ #include "dshow.h" #include "dsound.h" +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + /* Some of the QueryInterface tests are really just to check if I got the IID's right :) */ /* IMMDeviceCollection appears to have no QueryInterface method and instead forwards to mme */ @@ -82,11 +84,12 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) if (dev) IUnknown_Release(dev); } +/* Only do parameter tests here, the actual MMDevice testing should be a separate test */ START_TEST(mmdevenum) { HRESULT hr; IUnknown *unk = NULL; - IMMDeviceEnumerator *mme; + IMMDeviceEnumerator *mme, *mme2; ULONG ref; IMMDeviceCollection *col; @@ -110,6 +113,18 @@ START_TEST(mmdevenum) ok( (LONG_PTR)mme == (LONG_PTR)unk, "Pointers are unequal %p/%p\n", unk, mme); IUnknown_Release(unk); + /* Proving that it is static.. */ + hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme2); + IUnknown_Release(mme2); + ok(mme == mme2, "Pointers are not equal!\n"); + + hr = IUnknown_QueryInterface(mme, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "Null pointer on QueryInterface returned %08x\n", hr); + + hr = IUnknown_QueryInterface(mme, &GUID_NULL, (void**)&unk); + ok(!unk, "Unk not reset to null after invalid QI\n"); + ok(hr == E_NOINTERFACE, "Invalid hr %08x returned on IID_NULL\n", hr); + col = (void*)(LONG_PTR)0x12345678; hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, 0xffff, DEVICE_STATEMASK_ALL, &col); ok(hr == E_INVALIDARG, "Setting invalid data flow returned 0x%08x\n", hr); @@ -122,7 +137,7 @@ START_TEST(mmdevenum) ok(hr == E_POINTER, "Invalid pointer returned: 0x%08x\n", hr); hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, eAll, DEVICE_STATEMASK_ALL, &col); - ok(hr == S_OK, "Valid EnumAudioEndpoints returned 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "Valid EnumAudioEndpoints returned 0x%08x\n", hr); if (hr == S_OK) { ok(!!col, "Returned null pointer\n");

1 0

Gerald Pfeifer : configure: Sort WINE_TRY_CFLAGS entries alphabetically.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: eae5829ed2e2ef39c134e6fe6e267f3ef9bd73e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae5829ed2e2ef39c134e6fe6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 2 15:13:43 2010 +0100 configure: Sort WINE_TRY_CFLAGS entries alphabetically. --- configure | 40 ++++++++++++++++++++-------------------- configure.ac | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/configure b/configure index cc9580e..68af9e1 100755 --- a/configure +++ b/configure @@ -11456,55 +11456,55 @@ $as_echo "$ac_cv_cflags__Wstrict_prototypes" >&6; } if test $ac_cv_cflags__Wstrict_prototypes = yes; then : EXTRACFLAGS="$EXTRACFLAGS -Wstrict-prototypes" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wwrite-strings" >&5 -$as_echo_n "checking whether the compiler supports -Wwrite-strings... " >&6; } -if test "${ac_cv_cflags__Wwrite_strings+set}" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wtype-limits" >&5 +$as_echo_n "checking whether the compiler supports -Wtype-limits... " >&6; } +if test "${ac_cv_cflags__Wtype_limits+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wwrite-strings" +CFLAGS="$CFLAGS -Wtype-limits" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char *argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Wwrite_strings=yes + ac_cv_cflags__Wtype_limits=yes else - ac_cv_cflags__Wwrite_strings=no + ac_cv_cflags__Wtype_limits=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wwrite_strings" >&5 -$as_echo "$ac_cv_cflags__Wwrite_strings" >&6; } -if test $ac_cv_cflags__Wwrite_strings = yes; then : - EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wtype_limits" >&5 +$as_echo "$ac_cv_cflags__Wtype_limits" >&6; } +if test $ac_cv_cflags__Wtype_limits = yes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wtype-limits" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wtype-limits" >&5 -$as_echo_n "checking whether the compiler supports -Wtype-limits... " >&6; } -if test "${ac_cv_cflags__Wtype_limits+set}" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wwrite-strings" >&5 +$as_echo_n "checking whether the compiler supports -Wwrite-strings... " >&6; } +if test "${ac_cv_cflags__Wwrite_strings+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wtype-limits" +CFLAGS="$CFLAGS -Wwrite-strings" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char *argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Wtype_limits=yes + ac_cv_cflags__Wwrite_strings=yes else - ac_cv_cflags__Wtype_limits=no + ac_cv_cflags__Wwrite_strings=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wtype_limits" >&5 -$as_echo "$ac_cv_cflags__Wtype_limits" >&6; } -if test $ac_cv_cflags__Wtype_limits = yes; then : - EXTRACFLAGS="$EXTRACFLAGS -Wtype-limits" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wwrite_strings" >&5 +$as_echo "$ac_cv_cflags__Wwrite_strings" >&6; } +if test $ac_cv_cflags__Wwrite_strings = yes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings" fi saved_CFLAGS="$CFLAGS" diff --git a/configure.ac b/configure.ac index 2a9c83a..03a80d6 100644 --- a/configure.ac +++ b/configure.ac @@ -1494,8 +1494,8 @@ then WINE_TRY_CFLAGS([-fno-strict-aliasing]) WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) - WINE_TRY_CFLAGS([-Wwrite-strings]) WINE_TRY_CFLAGS([-Wtype-limits]) + WINE_TRY_CFLAGS([-Wwrite-strings]) dnl Check for noisy string.h saved_CFLAGS="$CFLAGS"

1 0

Alexandre Julliard : winedos: Merge the few definitions from dosvm. h into dosexe.h.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: 2ef707cc09d6f1649a5876512cb0a5e194e243bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef707cc09d6f1649a5876512… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 16:37:10 2010 +0100 winedos: Merge the few definitions from dosvm.h into dosexe.h. --- dlls/winedos/dosexe.h | 8 ++++++++ dlls/winedos/dosvm.c | 1 - dlls/winedos/dosvm.h | 33 --------------------------------- dlls/winedos/module.c | 1 - 4 files changed, 8 insertions(+), 35 deletions(-) diff --git a/dlls/winedos/dosexe.h b/dlls/winedos/dosexe.h index 108a603..29cf8a0 100644 --- a/dlls/winedos/dosexe.h +++ b/dlls/winedos/dosexe.h @@ -22,6 +22,7 @@ #define __WINE_DOSEXE_H #include <stdarg.h> +#include <sys/types.h> #include "windef.h" #include "wine/library.h" @@ -34,6 +35,13 @@ struct _DOSEVENT; +typedef struct { + PAPCFUNC proc; + ULONG_PTR arg; +} DOS_SPC; + +extern pid_t dosvm_pid; + /* amount of space reserved for relay stack */ #define DOSVM_RELAY_DATA_SIZE 4096 diff --git a/dlls/winedos/dosvm.c b/dlls/winedos/dosvm.c index d62a28b..fdd677f 100644 --- a/dlls/winedos/dosvm.c +++ b/dlls/winedos/dosvm.c @@ -51,7 +51,6 @@ #include "wincon.h" #include "dosexe.h" -#include "dosvm.h" #include "wine/debug.h" #include "excpt.h" diff --git a/dlls/winedos/dosvm.h b/dlls/winedos/dosvm.h deleted file mode 100644 index 098dacc..0000000 --- a/dlls/winedos/dosvm.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * DOS virtual machine - * - * Copyright 2000 Ove Kåven - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_DOSVM_H -#define __WINE_DOSVM_H - -#include <sys/types.h> /* pid_t */ - -typedef struct { - PAPCFUNC proc; - ULONG_PTR arg; -} DOS_SPC; - -extern pid_t dosvm_pid; - -#endif /* __WINE_DOSVM_H */ diff --git a/dlls/winedos/module.c b/dlls/winedos/module.c index 51b68e4..a4d9c51 100644 --- a/dlls/winedos/module.c +++ b/dlls/winedos/module.c @@ -47,7 +47,6 @@ #include "winerror.h" #include "wine/debug.h" #include "dosexe.h" -#include "dosvm.h" #include "vga.h" WINE_DEFAULT_DEBUG_CHANNEL(module);

1 0

Alexandre Julliard : wpp: Reset the line position when parsing a new file.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: 2b5d06afb9847d09ed6e9e721a93740f1e7c2828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5d06afb9847d09ed6e9e721… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 13:00:43 2010 +0100 wpp: Reset the line position when parsing a new file. --- libs/wpp/wpp.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index bce968a..47989f1 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -168,6 +168,8 @@ int wpp_parse( const char *input, FILE *output ) int ret; pp_status.input = NULL; + pp_status.line_number = 0; + pp_status.char_number = 0; pp_status.state = 0; ret = pp_push_define_state();

1 0

Alexandre Julliard : wrc: Merge the menuitem and menuitemex structures.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: 1b305dd2dff07ed6a9621af48d42cf0bc5a62d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b305dd2dff07ed6a9621af48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 12:31:22 2010 +0100 wrc: Merge the menuitem and menuitemex structures. --- tools/wrc/dumpres.c | 73 ++++++------------------- tools/wrc/genres.c | 4 +- tools/wrc/newstruc.c | 1 - tools/wrc/newstruc.h | 1 - tools/wrc/parser.y | 24 ++------ tools/wrc/translation.c | 135 +++++++++++++++++++---------------------------- tools/wrc/wrctypes.h | 24 +++------ 7 files changed, 88 insertions(+), 174 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b305dd2dff07ed6a9621…

1 0

Alexandre Julliard : winedos: Remove some obsolete comments.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: fd75ec1dfe1b850fcea12d28b31f3f4349eaeb1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd75ec1dfe1b850fcea12d28b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 16:29:19 2010 +0100 winedos: Remove some obsolete comments. --- dlls/winedos/dosvm.c | 12 ++++++------ dlls/winedos/fpu.c | 22 +++++++++++----------- dlls/winedos/int09.c | 2 +- dlls/winedos/int13.c | 2 +- dlls/winedos/int15.c | 2 +- dlls/winedos/int16.c | 2 +- dlls/winedos/int25.c | 2 +- dlls/winedos/int26.c | 2 +- dlls/winedos/int2f.c | 2 +- dlls/winedos/int31.c | 2 +- dlls/winedos/int33.c | 2 +- dlls/winedos/int67.c | 2 +- dlls/winedos/ioports.c | 2 +- 13 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/winedos/dosvm.c b/dlls/winedos/dosvm.c index 05c9371..d62a28b 100644 --- a/dlls/winedos/dosvm.c +++ b/dlls/winedos/dosvm.c @@ -275,7 +275,7 @@ void DOSVM_SendQueuedEvents( CONTEXT86 *context ) #ifdef MZ_SUPPORTED /*********************************************************************** - * QueueEvent (WINEDOS.@) + * DOSVM_QueueEvent */ void DOSVM_QueueEvent( INT irq, INT priority, DOSRELAY relay, LPVOID data) { @@ -616,7 +616,7 @@ INT DOSVM_Enter( CONTEXT86 *context ) } /*********************************************************************** - * OutPIC (WINEDOS.@) + * DOSVM_PIC_ioport_out */ void DOSVM_PIC_ioport_out( WORD port, BYTE val) { @@ -668,7 +668,7 @@ void DOSVM_PIC_ioport_out( WORD port, BYTE val) #else /* !MZ_SUPPORTED */ /*********************************************************************** - * Enter (WINEDOS.@) + * DOSVM_Enter */ INT DOSVM_Enter( CONTEXT86 *context ) { @@ -677,17 +677,17 @@ INT DOSVM_Enter( CONTEXT86 *context ) } /*********************************************************************** - * Wait (WINEDOS.@) + * DOSVM_Wait */ void DOSVM_Wait( CONTEXT86 *waitctx ) { } /*********************************************************************** - * OutPIC (WINEDOS.@) + * DOSVM_PIC_ioport_out */ void DOSVM_PIC_ioport_out( WORD port, BYTE val) {} /*********************************************************************** - * QueueEvent (WINEDOS.@) + * DOSVM_QueueEvent */ void DOSVM_QueueEvent( INT irq, INT priority, DOSRELAY relay, LPVOID data) { diff --git a/dlls/winedos/fpu.c b/dlls/winedos/fpu.c index 9643afb..733dfb7 100644 --- a/dlls/winedos/fpu.c +++ b/dlls/winedos/fpu.c @@ -33,7 +33,7 @@ static void FPU_ModifyCode(CONTEXT86 *context, BYTE Opcode); /********************************************************************** - * DOSVM_Int34Handler (WINEDOS16.152) + * DOSVM_Int34Handler * * Handler for int 34 (FLOATING POINT EMULATION - Opcode 0xd8). * @@ -48,7 +48,7 @@ void WINAPI DOSVM_Int34Handler(CONTEXT86 *context) /********************************************************************** - * DOSVM_Int35Handler (WINEDOS16.153) + * DOSVM_Int35Handler * * Handler for int 35 (FLOATING POINT EMULATION - Opcode 0xd9). * @@ -63,7 +63,7 @@ void WINAPI DOSVM_Int35Handler(CONTEXT86 *context) /********************************************************************** - * DOSVM_Int36Handler (WINEDOS16.154) + * DOSVM_Int36Handler * * Handler for int 36 (FLOATING POINT EMULATION - Opcode 0xda). * @@ -78,7 +78,7 @@ void WINAPI DOSVM_Int36Handler(CONTEXT86 *context) /********************************************************************** - * DOSVM_Int37Handler (WINEDOS16.155) + * DOSVM_Int37Handler * * Handler for int 37 (FLOATING POINT EMULATION - Opcode 0xdb). * @@ -93,7 +93,7 @@ void WINAPI DOSVM_Int37Handler(CONTEXT86 *context) /********************************************************************** - * DOSVM_Int38Handler (WINEDOS16.156) + * DOSVM_Int38Handler * * Handler for int 38 (FLOATING POINT EMULATION - Opcode 0xdc). * @@ -111,7 +111,7 @@ void WINAPI DOSVM_Int38Handler(CONTEXT86 *context) /********************************************************************** - * DOSVM_Int39Handler (WINEDOS16.157) + * DOSVM_Int39Handler * * Handler for int 39 (FLOATING POINT EMULATION - Opcode 0xdd). * @@ -126,7 +126,7 @@ void WINAPI DOSVM_Int39Handler(CONTEXT86 *context) /********************************************************************** - * DOSVM_Int3aHandler (WINEDOS16.158) + * DOSVM_Int3aHandler * * Handler for int 3a (FLOATING POINT EMULATION - Opcode 0xde). * @@ -141,7 +141,7 @@ void WINAPI DOSVM_Int3aHandler(CONTEXT86 *context) /********************************************************************** - * DOSVM_Int3bHandler (WINEDOS16.159) + * DOSVM_Int3bHandler * * Handler for int 3B (FLOATING POINT EMULATION - Opcode 0xdf). * @@ -156,7 +156,7 @@ void WINAPI DOSVM_Int3bHandler(CONTEXT86 *context) /********************************************************************** - * DOSVM_Int3cHandler (WINEDOS16.160) + * DOSVM_Int3cHandler * * Handler for int 3C (FLOATING POINT EMULATION - INSTRUCTIONS WITH SEGMENT OVERRIDE). * @@ -179,7 +179,7 @@ void WINAPI DOSVM_Int3cHandler(CONTEXT86 *context) /********************************************************************** - * DOSVM_Int3dHandler (WINEDOS16.161) + * DOSVM_Int3dHandler * * Handler for int 3D (FLOATING POINT EMULATION - Standalone FWAIT). * @@ -193,7 +193,7 @@ void WINAPI DOSVM_Int3dHandler(CONTEXT86 *context) /********************************************************************** - * DOSVM_Int3eHandler (WINEDOS16.162) + * DOSVM_Int3eHandler * * FLOATING POINT EMULATION -- Borland "Shortcut" call. * The two bytes following the int 3E instruction are diff --git a/dlls/winedos/int09.c b/dlls/winedos/int09.c index 0702287..91b7b5e 100644 --- a/dlls/winedos/int09.c +++ b/dlls/winedos/int09.c @@ -141,7 +141,7 @@ static void DOSVM_Int09UpdateKbdStatusFlags(BYTE scan, BOOL extended, BIOSDATA * } /********************************************************************** - * DOSVM_Int09Handler (WINEDOS16.109) + * DOSVM_Int09Handler * * Handler for int 09h. * See http://www.execpc.com/~geezer/osd/kbd/ for a very good description diff --git a/dlls/winedos/int13.c b/dlls/winedos/int13.c index 6b2b00c..b96d5e7 100644 --- a/dlls/winedos/int13.c +++ b/dlls/winedos/int13.c @@ -180,7 +180,7 @@ static void INT13_ReadFloppyParams( CONTEXT86 *context ) /********************************************************************** - * DOSVM_Int13Handler (WINEDOS16.119) + * DOSVM_Int13Handler * * Handler for int 13h (disk I/O). */ diff --git a/dlls/winedos/int15.c b/dlls/winedos/int15.c index 24c9121..bbbef3c 100644 --- a/dlls/winedos/int15.c +++ b/dlls/winedos/int15.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(int); /********************************************************************** - * DOSVM_Int15Handler (WINEDOS16.121) + * DOSVM_Int15Handler * * Handler for int 15h */ diff --git a/dlls/winedos/int16.c b/dlls/winedos/int16.c index 8fa5de0..47c9410 100644 --- a/dlls/winedos/int16.c +++ b/dlls/winedos/int16.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(int); /********************************************************************** - * DOSVM_Int16Handler (WINEDOS16.122) + * DOSVM_Int16Handler * * Handler for int 16h (keyboard) * diff --git a/dlls/winedos/int25.c b/dlls/winedos/int25.c index a0e5b10..c4588a3 100644 --- a/dlls/winedos/int25.c +++ b/dlls/winedos/int25.c @@ -76,7 +76,7 @@ BOOL DOSVM_RawRead(BYTE drive, DWORD begin, DWORD nr_sect, BYTE *dataptr, BOOL f /********************************************************************** - * DOSVM_Int25Handler (WINEDOS16.137) + * DOSVM_Int25Handler * * Handler for int 25h (absolute disk read). */ diff --git a/dlls/winedos/int26.c b/dlls/winedos/int26.c index a203882..6fb780f 100644 --- a/dlls/winedos/int26.c +++ b/dlls/winedos/int26.c @@ -65,7 +65,7 @@ BOOL DOSVM_RawWrite(BYTE drive, DWORD begin, DWORD nr_sect, BYTE *dataptr, BOOL /********************************************************************** - * DOSVM_Int26Handler (WINEDOS16.138) + * DOSVM_Int26Handler * * Handler for int 26h (absolute disk write). */ diff --git a/dlls/winedos/int2f.c b/dlls/winedos/int2f.c index 13b86ee..cab7391 100644 --- a/dlls/winedos/int2f.c +++ b/dlls/winedos/int2f.c @@ -116,7 +116,7 @@ DWORD WINAPI GetVersion16(void) } /********************************************************************** - * DOSVM_Int2fHandler (WINEDOS16.147) + * DOSVM_Int2fHandler * * Handler for int 2fh (multiplex). */ diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c index e8cc47b..a0df827 100644 --- a/dlls/winedos/int31.c +++ b/dlls/winedos/int31.c @@ -955,7 +955,7 @@ BOOL DOSVM_CheckWrappers( CONTEXT86 *context ) } /********************************************************************** - * DOSVM_Int31Handler (WINEDOS16.149) + * DOSVM_Int31Handler * * Handler for int 31h (DPMI). */ diff --git a/dlls/winedos/int33.c b/dlls/winedos/int33.c index bacf105..f111f5f 100644 --- a/dlls/winedos/int33.c +++ b/dlls/winedos/int33.c @@ -71,7 +71,7 @@ static void INT33_ResetMouse( CONTEXT86 *context ) /********************************************************************** - * DOSVM_Int33Handler (WINEDOS16.151) + * DOSVM_Int33Handler * * Handler for int 33h (MS MOUSE). */ diff --git a/dlls/winedos/int67.c b/dlls/winedos/int67.c index 34013df..6b461a5 100644 --- a/dlls/winedos/int67.c +++ b/dlls/winedos/int67.c @@ -320,7 +320,7 @@ static void EMS_restore_context( CONTEXT86 *context ) } /********************************************************************** - * DOSVM_Int67Handler (WINEDOS16.203) + * DOSVM_Int67Handler * * Handler for interrupt 67h EMS routines. */ diff --git a/dlls/winedos/ioports.c b/dlls/winedos/ioports.c index 5710046..25e03e8 100644 --- a/dlls/winedos/ioports.c +++ b/dlls/winedos/ioports.c @@ -927,7 +927,7 @@ DWORD WINAPI DOSVM_inport( int port, int size ) /********************************************************************** - * outport (WINEDOS.@) + * DOSVM_outport */ void WINAPI DOSVM_outport( int port, int size, DWORD value ) {

1 0

Alexandre Julliard : winedos: Merge the parallel port device I/ O handling into ioports.c.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: c7a57ee1a17b8b0d5044d2aeaf8413f49c4ffa1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7a57ee1a17b8b0d5044d2aea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 16:20:54 2010 +0100 winedos: Merge the parallel port device I/O handling into ioports.c. --- dlls/winedos/Makefile.in | 1 - dlls/winedos/dosexe.h | 5 - dlls/winedos/ioports.c | 309 ++++++++++++++++++++++++++++++++++++++++- dlls/winedos/ppdev.c | 352 ---------------------------------------------- 4 files changed, 306 insertions(+), 361 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7a57ee1a17b8b0d5044d…

1 0

Alexandre Julliard : winedos: Merge the UMB management into dosvm.c.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: 9492e1808bdd36274d85ae46354c0d5de0dc503d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9492e1808bdd36274d85ae463… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 14:31:01 2010 +0100 winedos: Merge the UMB management into dosvm.c. --- dlls/winedos/Makefile.in | 1 - dlls/winedos/dosexe.h | 5 +- dlls/winedos/dosvm.c | 278 ++++++++++++++++++++++++++++++++++++++++++- dlls/winedos/himem.c | 299 ---------------------------------------------- 4 files changed, 276 insertions(+), 307 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9492e1808bdd36274d85a…

1 0