December 2005 - Wine-Commits

Robert Shearman : widl: Don't treat FC_SMALL as FC_SHORT.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: f4356a64e3daefe125efe8714903ae84d68dfbfc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f4356a64e3daefe125efe87… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 12:11:11 2005 +0100 widl: Don't treat FC_SMALL as FC_SHORT. FC_SMALL is its own type and is the same size as FC_CHAR, not FC_SHORT. --- tools/widl/header.c | 5 +++++ tools/widl/parser.y | 2 +- tools/widl/typegen.c | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index be279ad..070657a 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -221,6 +221,11 @@ void write_type(FILE *h, type_t *t, var_ case RPC_FC_WCHAR: fprintf(h, "WCHAR"); break; + case RPC_FC_USMALL: + case RPC_FC_SMALL: + if (t->ref) fprintf(h, t->ref->name); + else fprintf(h, "small"); + break; case RPC_FC_USHORT: case RPC_FC_SHORT: if (t->ref) fprintf(h, t->ref->name); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 86eac75..ef331a2 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -585,7 +585,7 @@ m_int: int_std: tINT { $$ = make_type(RPC_FC_LONG, &std_int); } /* win32 only */ | tSHORT m_int { $$ = make_type(RPC_FC_SHORT, NULL); } - | tSMALL { $$ = make_type(RPC_FC_SHORT, NULL); } + | tSMALL { $$ = make_type(RPC_FC_SMALL, NULL); } | tLONG m_int { $$ = make_type(RPC_FC_LONG, NULL); } | tHYPER m_int { $$ = make_type(RPC_FC_HYPER, NULL); } | tINT64 { $$ = make_type(RPC_FC_HYPER, &std_int64); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 1ae84f1..14817da 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -71,6 +71,7 @@ static void write_procformatstring_var(F CASE_BASETYPE(FC_LONG); CASE_BASETYPE(FC_HYPER); CASE_BASETYPE(FC_IGNORE); + CASE_BASETYPE(FC_USMALL); CASE_BASETYPE(FC_SMALL); CASE_BASETYPE(FC_FLOAT); CASE_BASETYPE(FC_DOUBLE); @@ -162,6 +163,8 @@ unsigned int get_required_buffer_size(ty case RPC_FC_WCHAR: case RPC_FC_USHORT: case RPC_FC_SHORT: + case RPC_FC_USMALL: + case RPC_FC_SMALL: case RPC_FC_ULONG: case RPC_FC_LONG: case RPC_FC_FLOAT: @@ -198,6 +201,8 @@ void marshall_arguments(FILE *file, int { case RPC_FC_BYTE: case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: size = 1; alignment = 0; break; @@ -266,6 +271,8 @@ void unmarshall_arguments(FILE *file, in { case RPC_FC_BYTE: case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: size = 1; alignment = 0; break;

1 0

Robert Shearman : widl: Use WCHAR instead of wchar_t.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 6066106bb0aeb71d2e79390260743a86e2a04426 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6066106bb0aeb71d2e79390… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 12:10:26 2005 +0100 widl: Use WCHAR instead of wchar_t. Output IDL wchar_t types as WCHAR to avoid conflicts with the generally incompatible Unix wchar_t. --- tools/widl/header.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 95db8c9..be279ad 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -219,7 +219,7 @@ void write_type(FILE *h, type_t *t, var_ else fprintf(h, "char"); break; case RPC_FC_WCHAR: - fprintf(h, "wchar_t"); + fprintf(h, "WCHAR"); break; case RPC_FC_USHORT: case RPC_FC_SHORT:

1 0

Detlef Riekenberg : winspool: Added documentation for OpenPrinter.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: dd6aa8cf2d5247458ff6322a300582d1149e8a46 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dd6aa8cf2d5247458ff6322… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Dec 12 12:10:13 2005 +0100 winspool: Added documentation for OpenPrinter. --- dlls/winspool/info.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index f1d05c1..9b1771d 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -1039,6 +1039,8 @@ LONG WINAPI DocumentPropertiesW(HWND hWn /****************************************************************** * OpenPrinterA [WINSPOOL.@] * + * See OpenPrinterW. + * */ BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAULTSA pDefault) @@ -1069,6 +1071,32 @@ BOOL WINAPI OpenPrinterA(LPSTR lpPrinter /****************************************************************** * OpenPrinterW [WINSPOOL.@] * + * Open a Printer / Printserver or a Printer-Object + * + * PARAMS + * lpPrinterName [I] Name of Printserver, Printer, or Printer-Object + * phPrinter [O] The resulting Handle is stored here + * pDefault [I] PTR to Default Printer Settings or NULL + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * lpPrinterName is one of: + *| Printserver (NT only): "Servername" or NULL for the local Printserver + *| Printer: "PrinterName" + *| Printer-Object: "PrinterName,Job xxx" + *| XcvMonitor: "Servername,XcvMonitor MonitorName" + *| XcvPort: "Servername,XcvPort PortName" + * + * BUGS + *| Printserver not supported + *| Printer-Object not supported + *| XcvMonitor not supported + *| XcvPort not supported + *| pDefaults not supported + * */ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAULTSW pDefault)

1 0

Eric Pouech : Const correctness fixes.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 28442721fd0494263f8c6b671ee6dcb1873c93dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=28442721fd0494263f8c6b6… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 12 11:55:49 2005 +0100 Const correctness fixes. --- dlls/commdlg/finddlg32.c | 2 +- dlls/ole32/ole16.c | 4 ++-- dlls/user/cursoricon.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/commdlg/finddlg32.c b/dlls/commdlg/finddlg32.c index 20f9e34..6225773 100644 --- a/dlls/commdlg/finddlg32.c +++ b/dlls/commdlg/finddlg32.c @@ -385,7 +385,7 @@ static HWND COMDLG32_FR_DoFindReplace( hmod = (HMODULE)pdata->fr.hInstance; if(pdata->fr.Flags & FR_WINE_UNICODE) { - htemplate = FindResourceW(hmod, (LPWSTR)pdata->fr.lpTemplateName, (LPWSTR)RT_DIALOG); + htemplate = FindResourceW(hmod, (LPCWSTR)pdata->fr.lpTemplateName, (LPWSTR)RT_DIALOG); } else { diff --git a/dlls/ole32/ole16.c b/dlls/ole32/ole16.c index f7d76f3..15e054f 100644 --- a/dlls/ole32/ole16.c +++ b/dlls/ole32/ole16.c @@ -144,7 +144,7 @@ SEGPTR IMalloc16_fnRealloc(IMalloc16* if /****************************************************************************** * IMalloc16_GetSize [COMPOBJ.506] */ -DWORD IMalloc16_fnGetSize(const IMalloc16* iface,SEGPTR pv) +DWORD IMalloc16_fnGetSize(IMalloc16* iface,SEGPTR pv) { IMalloc16Impl *This = (IMalloc16Impl *)iface; TRACE("(%p)->GetSize(%08lx)\n",This,pv); @@ -154,7 +154,7 @@ DWORD IMalloc16_fnGetSize(const IMalloc1 /****************************************************************************** * IMalloc16_DidAlloc [COMPOBJ.507] */ -INT16 IMalloc16_fnDidAlloc(const IMalloc16* iface,LPVOID pv) { +INT16 IMalloc16_fnDidAlloc(IMalloc16* iface,LPVOID pv) { IMalloc16 *This = (IMalloc16 *)iface; TRACE("(%p)->DidAlloc(%p)\n",This,pv); return (INT16)-1; diff --git a/dlls/user/cursoricon.c b/dlls/user/cursoricon.c index 2e64d4a..c3bb046 100644 --- a/dlls/user/cursoricon.c +++ b/dlls/user/cursoricon.c @@ -284,7 +284,7 @@ static BOOL is_dib_monochrome( const BIT } else /* assume BITMAPINFOHEADER */ { - RGBQUAD *rgb = info->bmiColors; + const RGBQUAD *rgb = info->bmiColors; /* Check if the first color is black */ if ((rgb->rgbRed == 0) && (rgb->rgbGreen == 0) &&

1 0

Marcus Meissner : winsock: getaddrinfo return codes
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 8e203745f4834ea3088fbbb9fea2c0f92807b1f7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8e203745f4834ea3088fbbb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Dec 12 11:55:33 2005 +0100 winsock: getaddrinfo return codes Adjust return code EAI_NODATA to WSAHOST_NOT_FOUND, like windows does it. --- include/ws2tcpip.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 642808c..90a224b 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -182,7 +182,7 @@ typedef struct _INTERFACE_INFO # define EAI_FAIL WSANO_RECOVERY # define EAI_FAMILY WSAEAFNOSUPPORT # define EAI_MEMORY WSA_NOT_ENOUGH_MEMORY -# define EAI_NODATA WSANO_DATA +# define EAI_NODATA EAI_NONAME # define EAI_NONAME WSAHOST_NOT_FOUND # define EAI_SERVICE WSATYPE_NOT_FOUND # define EAI_SOCKTYPE WSAESOCKTNOSUPPORT @@ -196,7 +196,7 @@ typedef struct _INTERFACE_INFO # define WS_EAI_FAIL WSANO_RECOVERY # define WS_EAI_FAMILY WSAEAFNOSUPPORT # define WS_EAI_MEMORY WSA_NOT_ENOUGH_MEMORY -# define WS_EAI_NODATA WSANO_DATA +# define WS_EAI_NODATA WS_EAI_NONAME # define WS_EAI_NONAME WSAHOST_NOT_FOUND # define WS_EAI_SERVICE WSATYPE_NOT_FOUND # define WS_EAI_SOCKTYPE WSAESOCKTNOSUPPORT

1 0

Marcus Meissner : winsock: getaddrinfo - return code mapping.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: b364f81218805bf6fdc63fef7a18fa806c137785 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b364f81218805bf6fdc63fe… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Dec 12 11:55:11 2005 +0100 winsock: getaddrinfo - return code mapping. convert_eai_u2w should map from unix to windows, not the other way round (spotted by Dominic Wise). --- dlls/winsock/socket.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c index e67363b..2fc7d37 100644 --- a/dlls/winsock/socket.c +++ b/dlls/winsock/socket.c @@ -3106,8 +3106,8 @@ static int convert_eai_u2w(int unixret) int i; for (i=0;ws_eai_map[i][0];i++) - if (ws_eai_map[i][0] == unixret) - return ws_eai_map[i][1]; + if (ws_eai_map[i][1] == unixret) + return ws_eai_map[i][0]; return unixret; }

1 0

Paul Vriens : urlmon.idl: Add some BINDSTATUS values.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 6194255d5b8afa076bdbc0e5a03ae19aca2de198 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6194255d5b8afa076bdbc0e… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Dec 12 11:54:55 2005 +0100 urlmon.idl: Add some BINDSTATUS values. --- include/urlmon.idl | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 1fa8b4f..97ab839 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -219,7 +219,11 @@ interface IBindStatusCallback : IUnknown BINDSTATUS_SESSION_COOKIE_RECEIVED, BINDSTATUS_PERSISTENT_COOKIE_RECEIVED, BINDSTATUS_SESSION_COOKIES_ALLOWED, - BINDSTATUS_CACHECONTROL + BINDSTATUS_CACHECONTROL, + BINDSTATUS_CONTENTDISPOSITIONFILENAME, + BINDSTATUS_MIMETEXTPLAINMISMATCH, + BINDSTATUS_PUBLISHERAVAILABLE, + BINDSTATUS_DISPLAYNAMEAVAILABLE } BINDSTATUS;

1 0

Eric Pouech : comctl32: Fixed (harmless) typo.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 1d2f975ba9330bdca5bf5d47cf606564dba3f259 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d2f975ba9330bdca5bf5d4… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 12 11:54:35 2005 +0100 comctl32: Fixed (harmless) typo. --- dlls/comctl32/treeview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index cf04d4b..df71326 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -565,7 +565,7 @@ TREEVIEW_SendTreeviewNotify(TREEVIEW_INF TRACE("code:%d action:%x olditem:%p newitem:%p\n", code, action, oldItem, newItem); - ZeroMemory(&nmhdr, sizeof(NMTREEVIEWA)); + ZeroMemory(&nmhdr, sizeof(NMTREEVIEWW)); nmhdr.hdr.hwndFrom = hwnd; nmhdr.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID);

1 0

Eric Pouech : Removed some dead-code.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: ada6df3a84a7f2118bf5611184e2ab3ce7aa2da8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ada6df3a84a7f2118bf5611… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 12 11:54:19 2005 +0100 Removed some dead-code. --- dlls/commdlg/fontdlg.c | 3 +-- dlls/winaspi/aspi.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/commdlg/fontdlg.c b/dlls/commdlg/fontdlg.c index 1f9980b..b6ad99c 100644 --- a/dlls/commdlg/fontdlg.c +++ b/dlls/commdlg/fontdlg.c @@ -1076,7 +1076,6 @@ LRESULT CFn_WMPaint(HWND hDlg, WPARAM wP HDC hdc; HPEN hOrigPen; HFONT hOrigFont; - COLORREF rgbPrev; LOGFONTW lf = *(lpcf->lpLogFont); MapWindowPoints( 0, hDlg, (LPPOINT) &info.rcWindow, 2); @@ -1104,7 +1103,7 @@ LRESULT CFn_WMPaint(HWND hDlg, WPARAM wP info.rcWindow.top++; info.rcWindow.left++; hOrigFont = SelectObject( hdc, CreateFontIndirectW( &lf ) ); - rgbPrev=SetTextColor( hdc, lpcf->rgbColors ); + SetTextColor( hdc, lpcf->rgbColors ); DrawTextW( hdc, sample_lang_text[CHARSET_ORDER[lpcf->lpLogFont->lfCharSet]], diff --git a/dlls/winaspi/aspi.c b/dlls/winaspi/aspi.c index 35c8c8a..85e7dcf 100644 --- a/dlls/winaspi/aspi.c +++ b/dlls/winaspi/aspi.c @@ -221,7 +221,7 @@ DWORD ASPI_GetHCforController( int contr RegCloseKey(hkeyPort); return ((--i) << 16) + atoiW(&wPortName[9]); -}; +} int SCSI_OpenDevice( int h, int c, int t, int d ) {

1 0

Eric Pouech : Made some functions static.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 8cddd5d2fbd00b8addb02c57cdfe95002cec3250 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8cddd5d2fbd00b8addb02c5… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 12 11:53:56 2005 +0100 Made some functions static. --- dlls/ddraw/tests/ddrawmodes.c | 2 +- dlls/setupapi/queue.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 065157d..679ad12 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -94,7 +94,7 @@ static void flushdisplaymodes(void) modes_cnt = modes_size = 0; } -HRESULT WINAPI enummodescallback(LPDDSURFACEDESC lpddsd, LPVOID lpContext) +static HRESULT WINAPI enummodescallback(LPDDSURFACEDESC lpddsd, LPVOID lpContext) { trace("Width = %li, Height = %li, Refresh Rate = %li\r\n", lpddsd->dwWidth, lpddsd->dwHeight, diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index a444f9d..390fd04 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -947,7 +947,7 @@ static BOOL create_full_pathW(const WCHA return ret; } -BOOL static do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style) +static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style) { BOOL rc = FALSE; BOOL docopy = TRUE;

1 0