January 2007 - Wine-commits

Alexandre Julliard : msvcrt: Export various locale and codepage variables.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 6f9ad1b981a32b617da74e083a4a5e7bf43d9c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9ad1b981a32b617da74e083… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 16 12:08:59 2007 +0100 msvcrt: Export various locale and codepage variables. --- dlls/msvcrt/locale.c | 25 +++++++++++++++---------- dlls/msvcrt/mbcs.c | 8 ++++---- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/msvcrt.spec | 6 +++--- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index aea5488..5e08873 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -45,7 +45,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define MAX_LOCALE_LENGTH 256 char MSVCRT_current_lc_all[MAX_LOCALE_LENGTH]; LCID MSVCRT_current_lc_all_lcid; -int msvcrt_current_lc_all_cp; +int MSVCRT___lc_codepage; +int MSVCRT___lc_collate_cp; +HANDLE MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1]; /* MT */ #define LOCK_LOCALE _mlock(_SETLOCALE_LOCK); @@ -275,7 +277,8 @@ static void msvcrt_set_ctype(unsigned in unsigned char *traverse = (unsigned char *)cp.LeadByte; memset(MSVCRT_current_ctype, 0, sizeof(MSVCRT__ctype)); - msvcrt_current_lc_all_cp = codepage; + MSVCRT___lc_codepage = codepage; + MSVCRT___lc_collate_cp = codepage; /* Switch ctype macros to MBCS if needed */ MSVCRT___mb_cur_max = cp.MaxCharSize; @@ -342,7 +345,8 @@ char* CDECL MSVCRT_setlocale(int categor { MSVCRT_current_lc_all[0] = 'C'; MSVCRT_current_lc_all[1] = '\0'; - msvcrt_current_lc_all_cp = GetACP(); + MSVCRT___lc_codepage = GetACP(); + MSVCRT___lc_collate_cp = GetACP(); switch (category) { case MSVCRT_LC_ALL: @@ -535,22 +539,22 @@ int CDECL _setmbcp(int cp) LOCK_LOCALE; if ( cp > _MB_CP_SBCS) { - if( msvcrt_current_lc_all_cp != cp) + if( MSVCRT___lc_codepage != cp) /* FIXME: set ctype behaviour for this cp */ - msvcrt_current_lc_all_cp = cp; + MSVCRT___lc_codepage = cp; } else if(cp == _MB_CP_ANSI) { - msvcrt_current_lc_all_cp = GetACP(); + MSVCRT___lc_codepage = GetACP(); } else if(cp == _MB_CP_OEM) { - msvcrt_current_lc_all_cp = GetOEMCP(); + MSVCRT___lc_codepage = GetOEMCP(); } else if(cp == _MB_CP_LOCALE) { GetLocaleInfoW( LOCALE_USER_DEFAULT, LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER, - (WCHAR *)&msvcrt_current_lc_all_cp, sizeof(INT)/sizeof(WCHAR) ); + (WCHAR *)&MSVCRT___lc_codepage, sizeof(INT)/sizeof(WCHAR) ); } else if(cp == _MB_CP_SBCS) { @@ -560,8 +564,9 @@ int CDECL _setmbcp(int cp) { FIXME ("Unreal codepages (e.g. %d) not implemented\n", cp); } + MSVCRT___lc_collate_cp = MSVCRT___lc_codepage; UNLOCK_LOCALE; - TRACE("(%d) -> %d\n", cp, msvcrt_current_lc_all_cp); + TRACE("(%d) -> %d\n", cp, MSVCRT___lc_codepage); return 0; } @@ -570,7 +575,7 @@ int CDECL _setmbcp(int cp) */ int CDECL _getmbcp(void) { - return msvcrt_current_lc_all_cp; + return MSVCRT___lc_codepage; } /********************************************************************* diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 91549eb..6546ede 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -46,7 +46,7 @@ static MSVCRT_wchar_t msvcrt_mbc_to_wc(u mbch[1] = ch & 0xff; n_chars = 2; } - if (!MultiByteToWideChar(msvcrt_current_lc_all_cp, 0, mbch, n_chars, &chW, 1)) + if (!MultiByteToWideChar(MSVCRT___lc_codepage, 0, mbch, n_chars, &chW, 1)) { WARN("MultiByteToWideChar failed on %x\n", ch); return 0; @@ -745,7 +745,7 @@ unsigned int CDECL _mbbtombc(unsigned in int CDECL _ismbbkana(unsigned int c) { /* FIXME: use lc_ctype when supported, not lc_all */ - if(msvcrt_current_lc_all_cp == 932) + if(MSVCRT___lc_codepage == 932) { /* Japanese/Katakana, CP 932 */ return (c >= 0xa1 && c <= 0xdf); @@ -855,7 +855,7 @@ int CDECL _ismbcpunct(unsigned int ch) int CDECL _ismbchira(unsigned int c) { /* FIXME: use lc_ctype when supported, not lc_all */ - if(msvcrt_current_lc_all_cp == 932) + if(MSVCRT___lc_codepage == 932) { /* Japanese/Hiragana, CP 932 */ return (c >= 0x829f && c <= 0x82f1); @@ -869,7 +869,7 @@ int CDECL _ismbchira(unsigned int c) int CDECL _ismbckata(unsigned int c) { /* FIXME: use lc_ctype when supported, not lc_all */ - if(msvcrt_current_lc_all_cp == 932) + if(MSVCRT___lc_codepage == 932) { if(c < 256) return _ismbbkana(c); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3a50af2..68fa119 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -111,7 +111,7 @@ typedef struct __thread_data thread_data extern thread_data_t *msvcrt_get_thread_data(void); -extern int msvcrt_current_lc_all_cp; +extern int MSVCRT___lc_codepage; void msvcrt_set_errno(int); char* msvcrt_strndup(const char*,unsigned int); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 165ad42..9130322 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -96,9 +96,10 @@ @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym @ cdecl __iscsymf(long) MSVCRT___iscsymf -# extern __lc_codepage +@ extern __lc_codepage MSVCRT___lc_codepage @ stub __lc_collate -# extern __lc_handle +@ extern __lc_collate_cp MSVCRT___lc_collate_cp +@ extern __lc_handle MSVCRT___lc_handle @ cdecl __lconv_init() @ extern __mb_cur_max MSVCRT___mb_cur_max @ cdecl __p___argc() @@ -767,4 +768,3 @@ @ cdecl wctomb(ptr long) MSVCRT_wctomb @ varargs wprintf(wstr) MSVCRT_wprintf @ varargs wscanf(wstr) MSVCRT_wscanf -# extern __lc_collate_cp

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

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

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

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 : 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

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

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: Support xcv in AddPortW.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 5012fa06fcdd8e4d2af078f2a3c6a7ceeb06b7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5012fa06fcdd8e4d2af078f2a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jan 15 05:37:24 2007 +0100 winspool: Support xcv in AddPortW. --- dlls/winspool.drv/info.c | 48 ++++++++++++++++++++++++++++++--------------- 1 files changed, 32 insertions(+), 16 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 934565c..053cbbe 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -6001,7 +6001,8 @@ BOOL WINAPI AddPortA(LPSTR pName, HWND h BOOL WINAPI AddPortW(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName) { monitor_t * pm; - DWORD res = ROUTER_UNKNOWN; + monitor_t * pui; + DWORD res; TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pMonitorName)); @@ -6016,28 +6017,43 @@ BOOL WINAPI AddPortW(LPWSTR pName, HWND } /* an empty Monitorname is Invalid */ - if (!pMonitorName[0]) goto cleanup; + if (!pMonitorName[0]) { + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; + } pm = monitor_load(pMonitorName, NULL); - if (pm && pm->monitor) { - if (pm->monitor->pfnAddPort != NULL) { - res = pm->monitor->pfnAddPort(pName, hWnd, pMonitorName); - TRACE("got %d with %d\n", res, GetLastError()); + if (pm && pm->monitor && pm->monitor->pfnAddPort) { + res = pm->monitor->pfnAddPort(pName, hWnd, pMonitorName); + TRACE("got %d with %u\n", res, GetLastError()); + res = TRUE; + } + else + { + pui = monitor_loadui(pm); + if (pui && pui->monitorUI && pui->monitorUI->pfnAddPortUI) { + TRACE("use %p: %s\n", pui, debugstr_w(pui->dllname)); + res = pui->monitorUI->pfnAddPortUI(pName, hWnd, pMonitorName, NULL); + TRACE("got %d with %u\n", res, GetLastError()); + res = TRUE; } - else if (pm->monitor->pfnXcvOpenPort != NULL) + else { - FIXME("XcvOpenPort not implemented (dwMonitorSize: %d)\n", pm->dwMonitorSize); + FIXME("not implemented for %s (%p: %s => %p: %s)\n", debugstr_w(pMonitorName), + pm, pm ? debugstr_w(pm->dllname) : NULL, pui, pui ? debugstr_w(pui->dllname) : NULL); + + /* XP: ERROR_NOT_SUPPORTED, NT351,9x: ERROR_INVALID_PARAMETER */ + SetLastError(ERROR_NOT_SUPPORTED); + res = FALSE; } - /* invalidate cached PORT_INFO_2W */ - if (res == ROUTER_SUCCESS) monitor_flush(pm); + monitor_unload(pui); } - monitor_unload(pm); + /* invalidate cached PORT_INFO_2W */ + monitor_flush(pm); -cleanup: - /* XP: ERROR_NOT_SUPPORTED, NT351,9x: ERROR_INVALID_PARAMETER */ - if (res == ROUTER_UNKNOWN) SetLastError(ERROR_NOT_SUPPORTED); - TRACE("returning %d with %d\n", (res == ROUTER_SUCCESS), GetLastError()); - return (res == ROUTER_SUCCESS); + monitor_unload(pm); + TRACE("returning %d with %u\n", res, GetLastError()); + return res; } /******************************************************************************

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