wine-commits January 2007

wine-commits@winehq.org

4 participants
893 discussions

Alexandre Julliard : wmc: Added support for neutral languages.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 90b839592b3c27e1a9a7c651607f0f1a8d687fa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90b839592b3c27e1a9a7c6516… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 16 11:43:56 2007 +0100 wmc: Added support for neutral languages. --- tools/wmc/lang.c | 50 +++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 45 insertions(+), 5 deletions(-) diff --git a/tools/wmc/lang.c b/tools/wmc/lang.c index dab6c54..e33a655 100644 --- a/tools/wmc/lang.c +++ b/tools/wmc/lang.c @@ -33,7 +33,47 @@ */ static const language_t languages[] = { - {0x0000, 437, 1252, "Neutral", "Neutral"}, + {0x0000, 437, 1252, "Neutral", NULL}, + {0x0002, 866, 1251, "Bulgarian", NULL}, + {0x0003, 850, 1252, "Catalan", NULL}, + {0x0005, 852, 1250, "Czech", NULL}, + {0x0006, 850, 1252, "Danish", NULL}, + {0x0007, 850, 1252, "German", NULL}, + {0x0008, 737, 1253, "Greek", NULL}, + {0x0009, 437, 1252, "English", NULL}, + {0x000A, 850, 1252, "Spanish - Traditional Sort", NULL}, + {0x000B, 850, 1252, "Finnish", NULL}, + {0x000C, 850, 1252, "French", NULL}, + {0x000E, 852, 1250, "Hungarian", NULL}, + {0x000F, 850, 1252, "Icelandic", NULL}, + {0x0010, 850, 1252, "Italian", NULL}, + {0x0011, 932, 932, "Japanese", NULL}, + {0x0012, 949, 949, "Korean", NULL}, + {0x0013, 850, 1252, "Dutch", NULL}, + {0x0014, 850, 1252, "Norwegian (Bokm�l)", NULL}, + {0x0015, 852, 1250, "Polish", NULL}, + {0x0016, 850, 1252, "Portuguese", NULL}, + {0x0018, 852, 1250, "Romanian", NULL}, + {0x0019, 866, 1251, "Russian", NULL}, + {0x001A, 852, 1250, "Serbian", NULL}, + {0x001B, 852, 1250, "Slovak", NULL}, + {0x001C, 852, 1250, "Albanian", NULL}, + {0x001D, 850, 1252, "Swedish", NULL}, + {0x001F, 857, 1254, "Turkish", NULL}, + {0x0021, 850, 1252, "Indonesian", NULL}, + {0x0022, 866, 1251, "Ukrainian", NULL}, + {0x0023, 866, 1251, "Belarusian", NULL}, + {0x0024, 852, 1250, "Slovene", NULL}, + {0x0025, 775, 1257, "Estonian", NULL}, + {0x0026, 775, 1257, "Latvian", NULL}, + {0x0027, 775, 1257, "Lithuanian", NULL}, + {0x002A,1258, 1258, "Vietnamese", NULL}, + {0x002D, 850, 1252, "Basque", NULL}, + {0x002F, 866, 1251, "Macedonian", NULL}, + {0x0036, 850, 1252, "Afrikaans", NULL}, + {0x0038, 852, 1252, "Faroese", NULL}, + {0x003C, 437, 1252, "Irish", NULL}, + {0x003E, 850, 1252, "Malay", NULL}, {0x0402, 866, 1251, "Bulgarian", "Bulgaria"}, {0x0403, 850, 1252, "Catalan", "Spain"}, {0x0405, 852, 1250, "Czech", "Czech Republic"}, @@ -67,11 +107,11 @@ static const language_t languages[] = { {0x0425, 775, 1257, "Estonian", "Estonia"}, {0x0426, 775, 1257, "Latvian", "Latvia"}, {0x0427, 775, 1257, "Lithuanian", "Lithuania"}, -/* {0x042A, ?, ?, "Vietnamese", "Vietnam"},*/ + {0x042A,1258, 1258, "Vietnamese", "Vietnam"}, {0x042D, 850, 1252, "Basque", "Spain"}, {0x042F, 866, 1251, "Macedonian", "Former Yugoslav Republic of Macedonia"}, {0x0436, 850, 1252, "Afrikaans", "South Africa"}, -/* {0x0438, 852, 1252, "Faroese", "Faroe Islands"}, FIXME: Not sure about codepages */ + {0x0438, 852, 1252, "Faroese", "Faroe Islands"}, {0x043C, 437, 1252, "Irish", "Ireland"}, {0x043E, 850, 1252, "Malay", "Malaysia"}, /* {0x048F, ?, ?, "Esperanto", "<none>"},*/ @@ -84,7 +124,7 @@ static const language_t languages[] = { {0x0813, 850, 1252, "Dutch", "Belgium"}, {0x0814, 850, 1252, "Norwegian (Nynorsk)", "Norway"}, {0x0816, 850, 1252, "Portuguese", "Portugal"}, -/* {0x081A, ?, ?, "Serbian (latin)", "Yugoslavia"},*/ + {0x081A, 852, 1250, "Serbian (latin)", "Yugoslavia"}, {0x081D, 850, 1252, "Swedish (Finland)", "Finland"}, {0x0C07, 850, 1252, "German", "Austria"}, {0x0C09, 850, 1252, "English", "Australia"}, @@ -135,7 +175,7 @@ void show_languages(void) languages[i].doscp, languages[i].wincp, languages[i].name, - languages[i].country); + languages[i].country ? languages[i].country : "Neutral"); } static int langcmp(const void *p1, const void *p2)

1 0

Hans Leidekker : snmpapi: Implement SnmpUtilVarBindList{Cpy,Free}.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 339989638d663d95a74f21d18cc8cdd9d0433480 URL: http://source.winehq.org/git/wine.git/?a=commit;h=339989638d663d95a74f21d18… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jan 15 19:08:40 2007 +0100 snmpapi: Implement SnmpUtilVarBindList{Cpy,Free}. --- dlls/snmpapi/main.c | 72 +++++++++++++++++++++++++++++++++++++++++++++ dlls/snmpapi/snmpapi.spec | 4 +- 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index fea3d86..16d9b30 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -54,24 +54,36 @@ BOOL WINAPI DllMain( return TRUE; } +/*********************************************************************** + * SnmpUtilMemAlloc (SNMPAPI.@) + */ LPVOID WINAPI SnmpUtilMemAlloc(UINT nbytes) { TRACE("(%d)\n", nbytes); return HeapAlloc(GetProcessHeap(), 0, nbytes); } +/*********************************************************************** + * SnmpUtilMemReAlloc (SNMPAPI.@) + */ LPVOID WINAPI SnmpUtilMemReAlloc(LPVOID mem, UINT nbytes) { TRACE("(%p, %d)\n", mem, nbytes); return HeapReAlloc(GetProcessHeap(), 0, mem, nbytes); } +/*********************************************************************** + * SnmpUtilMemFree (SNMPAPI.@) + */ void WINAPI SnmpUtilMemFree(LPVOID mem) { TRACE("(%p)\n", mem); HeapFree(GetProcessHeap(), 0, mem); } +/*********************************************************************** + * SnmpUtilOidCpy (SNMPAPI.@) + */ INT WINAPI SnmpUtilOidCpy(AsnObjectIdentifier *dst, AsnObjectIdentifier *src) { unsigned int i, size; @@ -94,6 +106,9 @@ INT WINAPI SnmpUtilOidCpy(AsnObjectIdent return SNMPAPI_ERROR; } +/*********************************************************************** + * SnmpUtilOidFree (SNMPAPI.@) + */ void WINAPI SnmpUtilOidFree(AsnObjectIdentifier *oid) { TRACE("(%p)\n", oid); @@ -102,6 +117,9 @@ void WINAPI SnmpUtilOidFree(AsnObjectIde HeapFree(GetProcessHeap(), 0, oid); } +/*********************************************************************** + * SnmpUtilVarBindCpy (SNMPAPI.@) + */ INT WINAPI SnmpUtilVarBindCpy(SnmpVarBind *dst, SnmpVarBind *src) { unsigned int i, size; @@ -171,6 +189,9 @@ error: return SNMPAPI_ERROR; } +/*********************************************************************** + * SnmpUtilVarBindFree (SNMPAPI.@) + */ void WINAPI SnmpUtilVarBindFree(SnmpVarBind *vb) { TRACE("(%p)\n", vb); @@ -198,3 +219,54 @@ void WINAPI SnmpUtilVarBindFree(SnmpVarB HeapFree(GetProcessHeap(), 0, vb->name.ids); HeapFree(GetProcessHeap(), 0, vb); } + +/*********************************************************************** + * SnmpUtilVarBindListCpy (SNMPAPI.@) + */ +INT WINAPI SnmpUtilVarBindListCpy(SnmpVarBindList *dst, SnmpVarBindList *src) +{ + unsigned int i, size; + SnmpVarBind *src_entry, *dst_entry; + + TRACE("(%p, %p)\n", dst, src); + + size = src->len * sizeof(SnmpVarBind *); + if (!(dst->list = HeapAlloc(GetProcessHeap(), 0, size))) + { + HeapFree(GetProcessHeap(), 0, dst); + return SNMPAPI_ERROR; + } + src_entry = src->list; + dst_entry = dst->list; + for (i = 0; i < src->len; i++) + { + if (SnmpUtilVarBindCpy(dst_entry, src_entry)) + { + src_entry++; + dst_entry++; + } + else + { + for (--i; i > 0; i--) SnmpUtilVarBindFree(--dst_entry); + HeapFree(GetProcessHeap(), 0, dst->list); + return SNMPAPI_ERROR; + } + } + dst->len = src->len; + return SNMPAPI_NOERROR; +} + +/*********************************************************************** + * SnmpUtilVarBindListFree (SNMPAPI.@) + */ +void WINAPI SnmpUtilVarBindListFree(SnmpVarBindList *vb) +{ + unsigned int i; + SnmpVarBind *entry; + + TRACE("(%p)\n", vb); + + entry = vb->list; + for (i = 0; i < vb->len; i++) SnmpUtilVarBindFree(entry++); + HeapFree(GetProcessHeap(), 0, vb->list); +} diff --git a/dlls/snmpapi/snmpapi.spec b/dlls/snmpapi/snmpapi.spec index 615b895..e6a8084 100644 --- a/dlls/snmpapi/snmpapi.spec +++ b/dlls/snmpapi/snmpapi.spec @@ -41,5 +41,5 @@ @ stub SnmpUtilUnicodeToAnsi @ stdcall SnmpUtilVarBindCpy(ptr ptr) @ stdcall SnmpUtilVarBindFree(ptr) -@ stub SnmpUtilVarBindListCpy -@ stub SnmpUtilVarBindListFree +@ stdcall SnmpUtilVarBindListCpy(ptr ptr) +@ stdcall SnmpUtilVarBindListFree(ptr)

1 0

Kai Blin : winetools: Fix installing on distributions without a root password.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 71925fe76cd1b6fdb9e6b95e34dc2709351cafb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71925fe76cd1b6fdb9e6b95e3… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Jan 15 15:46:31 2007 +0100 winetools: Fix installing on distributions without a root password. --- tools/wineinstall | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/wineinstall b/tools/wineinstall index 26a89f2..5c57f54 100755 --- a/tools/wineinstall +++ b/tools/wineinstall @@ -244,9 +244,12 @@ then { if ! su root -c "$sucommand" then { - if ! su root -c "$sucommand" + echo + echo "Incorrect root password. If you are running Ubuntu or a similar distribution," + echo "'make install' needs to be run via the sudo wrapper, so trying that one now" + if ! sudo su root -c "$sucommand" then { - echo + echo echo "Either you entered an incorrect password or we failed to" echo "run '$sucommand' correctly." echo "If you didn't enter an incorrect password then please"

1 0

Robert Reif : dsound: Fix tests for old versions of windows.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 2e44a3b2a281fc723ed1755262e592229c6a606e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e44a3b2a281fc723ed175526… Author: Robert Reif <reif(a)earthlink.net> Date: Mon Jan 15 09:00:39 2007 -0500 dsound: Fix tests for old versions of windows. --- dlls/dsound/tests/Makefile.in | 2 +- dlls/dsound/tests/capture.c | 31 +++++++---- dlls/dsound/tests/ds3d.c | 37 ++++++++++--- dlls/dsound/tests/ds3d8.c | 69 +++++++++++++++++------- dlls/dsound/tests/dsound.c | 55 +++++++++++++------ dlls/dsound/tests/dsound8.c | 32 +++++++---- dlls/dsound/tests/duplex.c | 25 +++++---- dlls/dsound/tests/propset.c | 116 +++++++++++++++++++++------------------- 8 files changed, 230 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e44a3b2a281fc723ed17…

1 0

Andrew Talbot : shell32: Remove unused variable.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 670cf778aad7aafd5f4637f2fff94519d149c115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=670cf778aad7aafd5f4637f2f… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jan 15 21:53:23 2007 +0000 shell32: Remove unused variable. --- dlls/shell32/shellole.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 8572191..e39a57a 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -50,7 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); extern HRESULT WINAPI IFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); static const WCHAR sShell32[12] = {'S','H','E','L','L','3','2','.','D','L','L','\0'}; -static const WCHAR sOLE32[10] = {'O','L','E','3','2','.','D','L','L','\0'}; /************************************************************************** * Default ClassFactory types

1 0

Andrew Talbot : msvcrt: Move static function from header into file where it is called.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 464a6eb431feb1afebbc64c3b2d8bb63e5790c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=464a6eb431feb1afebbc64c3b… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jan 15 21:56:05 2007 +0000 msvcrt: Move static function from header into file where it is called. --- dlls/msvcrt/cpp.c | 6 ++++++ dlls/msvcrt/cppexcept.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 5ea595d..854566e 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -97,6 +97,12 @@ extern const vtable_ptr MSVCRT_bad_cast_ extern const vtable_ptr MSVCRT___non_rtti_object_vtable; extern const vtable_ptr MSVCRT_type_info_vtable; +/* get the vtable pointer for a C++ object */ +static inline const vtable_ptr *get_vtable( void *obj ) +{ + return *(const vtable_ptr **)obj; +} + static inline const rtti_object_locator *get_obj_locator( void *cppobj ) { const vtable_ptr *vtable = get_vtable( cppobj ); diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index d4c8068..bf607c9 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -135,12 +135,6 @@ typedef struct __cxx_exception_type void _CxxThrowException(exception*,const cxx_exception_type*); -/* get the vtable pointer for a C++ object */ -static inline const vtable_ptr *get_vtable( void *obj ) -{ - return *(const vtable_ptr **)obj; -} - static inline const char *dbgstr_type_info( const type_info *info ) { if (!info) return "{}";

1 0

Andrew Talbot : oleaut32: Remove unused items.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 26af24c9053cd6bc1dbcf957ccbd71ca7fffa522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26af24c9053cd6bc1dbcf957c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jan 13 20:37:15 2007 +0000 oleaut32: Remove unused items. --- dlls/oleaut32/varformat.c | 1 - dlls/oleaut32/vartype.c | 2 -- 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 095cc6c..5faecd2 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -50,7 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(variant); static const WCHAR szPercent_d[] = { '%','d','\0' }; static const WCHAR szPercentZeroTwo_d[] = { '%','0','2','d','\0' }; -static const WCHAR szPercentZeroFour_d[] = { '%','0','4','d','\0' }; static const WCHAR szPercentZeroStar_d[] = { '%','0','*','d','\0' }; #if 0 diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 2cccbec..1b2199c 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -228,7 +228,6 @@ SIMPLE(LONG64, BYTE, VarI8FromUI1); SIMPLE(LONG64, SHORT, VarI8FromI2); SIMPLE(LONG64, signed char, VarI8FromI1); SIMPLE(LONG64, USHORT, VarI8FromUI2); -SIMPLE(LONG64, LONG, VarI8FromI4); SIMPLE(LONG64, ULONG, VarI8FromUI4); POSTST(LONG64, ULONG64, VarI8FromUI8, I8_MAX); @@ -237,7 +236,6 @@ SIMPLE(ULONG64, BYTE, VarUI8FromUI1); NEGTST(ULONG64, SHORT, VarUI8FromI2); NEGTST(ULONG64, signed char, VarUI8FromI1); SIMPLE(ULONG64, USHORT, VarUI8FromUI2); -NEGTST(ULONG64, LONG, VarUI8FromI4); SIMPLE(ULONG64, ULONG, VarUI8FromUI4); NEGTST(ULONG64, LONG64, VarUI8FromI8);

1 0

Detlef Riekenberg : winspool/tests: Fix tests for EnumPrinters when the spooler is off.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 85cd0a1f7afca99f90a62ce5fc2cad710829967b URL: http://source.winehq.org/git/wine.git/?a=commit;h=85cd0a1f7afca99f90a62ce5f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jan 15 05:38:47 2007 +0100 winspool/tests: Fix tests for EnumPrinters when the spooler is off. --- dlls/winspool.drv/tests/info.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index d1c3282..888a7d6 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1654,6 +1654,7 @@ static void test_EnumPrinters(void) SetLastError(0xdeadbeef); neededA = -1; ret = EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &neededA, &num); + RETURN_ON_DEACTIVATED_SPOOLER(ret) if (!ret) { /* We have 1 or more printers */

1 0

Detlef Riekenberg : winspool: More error checks for XcvDataW.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: b86a7644d99b23a4e3bcb197f793963ad6638d33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b86a7644d99b23a4e3bcb197f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jan 15 05:38:28 2007 +0100 winspool: More error checks for XcvDataW. --- dlls/winspool.drv/info.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f3a51d8..3eb382f 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -6684,6 +6684,18 @@ BOOL WINAPI XcvDataW( HANDLE hXcv, LPCWS return FALSE; } + if (!pcbOutputNeeded) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!pszDataName || !pdwStatus || (!pOutputData && (cbOutputData > 0))) { + SetLastError(RPC_X_NULL_REF_POINTER); + return FALSE; + } + + *pcbOutputNeeded = 0; + *pdwStatus = printer->pm->monitor->pfnXcvDataPort(printer->hXcv, pszDataName, pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded);

1 0

Detlef Riekenberg : winspool: Improve trace for ClosePrinter.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 619621d9ea931099ce80cfd0453f6d1bc793059f URL: http://source.winehq.org/git/wine.git/?a=commit;h=619621d9ea931099ce80cfd04… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jan 15 05:38:22 2007 +0100 winspool: Improve trace for ClosePrinter. --- dlls/winspool.drv/info.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 053cbbe..f3a51d8 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2961,17 +2961,22 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter opened_printer_t *printer = NULL; BOOL ret = FALSE; - TRACE("Handle %p\n", hPrinter); + TRACE("(%p)\n", hPrinter); EnterCriticalSection(&printer_handles_cs); if ((i > 0) && (i <= nb_printer_handles)) printer = printer_handles[i - 1]; + if(printer) { struct list *cursor, *cursor2; + TRACE("%p: %s (hXcv: %p) for %s (doc: %p)\n", printer->pm, + debugstr_w(printer->pm ? printer->pm->dllname : NULL), + printer->hXcv, debugstr_w(printer->name), printer->doc ); + if(printer->doc) EndDocPrinter(hPrinter);

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2007