May 2009 - Wine-commits - list.winehq.org

Francois Gouget : riched20: Make some functions static.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 19020b9ef55700ecd1ba6872a3dece02e4915109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19020b9ef55700ecd1ba6872a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:48:48 2009 +0200 riched20: Make some functions static. --- dlls/riched20/editor.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 00fc38e..278b9aa 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2901,7 +2901,7 @@ get_msg_name(UINT msg) return ""; } -void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam) +static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam) { int x,y; ME_DisplayItem *para, *run; @@ -4616,14 +4616,14 @@ static BOOL ME_RegisterEditorClass(HINSTANCE hInstance) return TRUE; } -LRESULT WINAPI REComboWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { +static LRESULT WINAPI REComboWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { /* FIXME: Not implemented */ TRACE("hWnd %p msg %04x (%s) %08lx %08lx\n", hWnd, msg, get_msg_name(msg), wParam, lParam); return DefWindowProcW(hWnd, msg, wParam, lParam); } -LRESULT WINAPI REListWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { +static LRESULT WINAPI REListWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { /* FIXME: Not implemented */ TRACE("hWnd %p msg %04x (%s) %08lx %08lx\n", hWnd, msg, get_msg_name(msg), wParam, lParam);

1 0

Francois Gouget : winex11.drv: Replace an strdup() with HeapAlloc() in the OpenGL code.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: c642481305fb9de241760e1aa8d13943d8bc8120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c642481305fb9de241760e1aa… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:52:05 2009 +0200 winex11.drv: Replace an strdup() with HeapAlloc() in the OpenGL code. Free the corresponding memory when the library is unloaded. --- dlls/winex11.drv/opengl.c | 15 ++++++++++++--- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b15b4e2..30eb95b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -76,7 +76,7 @@ typedef struct wine_glextension { struct WineGLInfo { const char *glVersion; - const char *glExtensions; + char *glExtensions; int glxVersion[2]; @@ -274,12 +274,13 @@ MAKE_FUNCPTR(glFinish) MAKE_FUNCPTR(glFlush) #undef MAKE_FUNCPTR +static BOOL infoInitialized = FALSE; static BOOL X11DRV_WineGL_InitOpenglInfo(void) { - static BOOL infoInitialized = FALSE; int screen = DefaultScreen(gdi_display); Window win = RootWindow(gdi_display, screen); + const char* str; Visual *visual; XVisualInfo template; XVisualInfo *vis; @@ -318,7 +319,9 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) } WineGLInfo.glVersion = (const char *) pglGetString(GL_VERSION); - WineGLInfo.glExtensions = strdup((const char *) pglGetString(GL_EXTENSIONS)); + str = (const char *) pglGetString(GL_EXTENSIONS); + WineGLInfo.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1); + strcpy(WineGLInfo.glExtensions, str); /* Get the common GLX version supported by GLX client and server ( major/minor) */ pglXQueryVersion(gdi_display, &WineGLInfo.glxVersion[0], &WineGLInfo.glxVersion[1]); @@ -352,6 +355,12 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) return TRUE; } +void X11DRV_OpenGL_Cleanup(void) +{ + HeapFree(GetProcessHeap(), 0, WineGLInfo.glExtensions); + infoInitialized = FALSE; +} + static BOOL has_opengl(void) { static int init_done; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 7d0b2ba..b11e6a1 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -226,6 +226,7 @@ extern int CDECL X11DRV_DescribePixelFormat(X11DRV_PDEVICE *physDev, PIXELFORMATDESCRIPTOR *ppfd); extern int CDECL X11DRV_GetPixelFormat(X11DRV_PDEVICE *physDev); extern BOOL CDECL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev); +extern void X11DRV_OpenGL_Cleanup(void); /* X11 driver internal functions */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 020d6b5..41c866c 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -587,6 +587,7 @@ static void process_detach(void) /* cleanup GDI */ X11DRV_GDI_Finalize(); + X11DRV_OpenGL_Cleanup(); IME_UnregisterClasses(); DeleteCriticalSection( &X11DRV_CritSection );

1 0

Andrew Talbot : cabinet: Constify a variable.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 9ca199a87d6017c333407604cf113f4f69947b94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ca199a87d6017c333407604c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon May 25 22:41:49 2009 +0100 cabinet: Constify a variable. --- dlls/cabinet/fdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index c7749eb..8132818 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2260,7 +2260,7 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state return DECR_OK; } -static void free_decompression_temps(HFDI hfdi, struct fdi_folder *fol, +static void free_decompression_temps(HFDI hfdi, const struct fdi_folder *fol, fdi_decomp_state *decomp_state) { switch (fol->comp_type & cffoldCOMPTYPE_MASK) {

1 0

Daniel Santos : make_requests: Correct comment in header (minor patch).
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 0ea28a649b0e35fac0a3200e534ff9e6003aa68b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea28a649b0e35fac0a3200e5… Author: Daniel Santos <javatroubadour(a)yahoo.com> Date: Mon May 25 13:07:24 2009 -0700 make_requests: Correct comment in header (minor patch). --- tools/make_requests | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/make_requests b/tools/make_requests index b53af11..e7a1ffb 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -1,7 +1,7 @@ #! /usr/bin/perl -w # # Build the server/trace.c and server/request.h files -# from the contents of include/wine/server.h. +# from the contents of server/protocol.def. # # Copyright (C) 1998 Alexandre Julliard #

1 0

Henri Verbeet : wined3d: Use SM3 shader limits for SM4.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 1ccfab171fb285c999f2f75336caf0f525b28403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ccfab171fb285c999f2f7533… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 09:15:12 2009 +0200 wined3d: Use SM3 shader limits for SM4. This isn't completely right, since as far as I'm aware SM4 doesn't have shader limits in the same sense as previous shader models, but this should do for now. --- dlls/wined3d/pixelshader.c | 4 ++++ dlls/wined3d/vertexshader.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 6045085..26904a8 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -178,6 +178,10 @@ static void pshader_set_limits(IWineD3DPixelShaderImpl *This) This->baseShader.limits.label = 16; break; + case WINED3D_SHADER_VERSION(4,0): + FIXME("Using 3.0 limits for 4.0 shader\n"); + /* Fall through */ + case WINED3D_SHADER_VERSION(3,0): This->baseShader.limits.temporary = 32; This->baseShader.limits.constant_float = 224; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index f7766a1..26350d9 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -71,6 +71,10 @@ static void vshader_set_limits(IWineD3DVertexShaderImpl *This) This->baseShader.limits.constant_float = min(256, GL_LIMITS(vshader_constantsF)); break; + case WINED3D_SHADER_VERSION(4,0): + FIXME("Using 3.0 limits for 4.0 shader\n"); + /* Fall through */ + case WINED3D_SHADER_VERSION(3,0): This->baseShader.limits.temporary = 32; This->baseShader.limits.constant_bool = 32;

1 0

Francois Gouget : winapi_fixup: There is not much point for this tool so remove it.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: a5924303afae92706274661fddd2e972cd1e42f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5924303afae92706274661fd… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 12:10:07 2009 +0200 winapi_fixup: There is not much point for this tool so remove it. --- tools/winapi/winapi_fixup | 232 ---------------- tools/winapi/winapi_fixup_documentation.pm | 402 --------------------------- tools/winapi/winapi_fixup_editor.pm | 407 ---------------------------- tools/winapi/winapi_fixup_options.pm | 68 ----- tools/winapi/winapi_fixup_statements.pm | 337 ----------------------- 5 files changed, 0 insertions(+), 1446 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a5924303afae927062746…

1 0

Francois Gouget : winapi_cleanup: There is not much point for this tool so remove it.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: fb9e4afd887ce8099c073e370260bea3637c7ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb9e4afd887ce8099c073e370… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 12:10:56 2009 +0200 winapi_cleanup: There is not much point for this tool so remove it. --- tools/winapi/winapi_cleanup | 231 -------------------------------- tools/winapi/winapi_cleanup_options.pm | 55 -------- 2 files changed, 0 insertions(+), 286 deletions(-) diff --git a/tools/winapi/winapi_cleanup b/tools/winapi/winapi_cleanup deleted file mode 100755 index 29f94a6..0000000 --- a/tools/winapi/winapi_cleanup +++ /dev/null @@ -1,231 +0,0 @@ -#! /usr/bin/perl -w - -# Copyright 2002 Patrik Stridvall -# -# 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 -# - -use strict; - -BEGIN { - $0 =~ m%^(.*?/?tools)/winapi/winapi_cleanup$%; - require "$1/winapi/setup.pm"; -} - -use config qw($current_dir $wine_dir file_absolutize file_directory); -use output qw($output); -use winapi_cleanup_options qw($options); - -use nativeapi qw($nativeapi); -use util qw(edit_file); - -if($options->progress) { - $output->enable_progress; -} else { - $output->disable_progress; -} - -######################################################################## -# cleanup_file - -sub cleanup_file($$$) { - local *IN = shift; - local *OUT = shift; - - my $file = shift; - my $dir = do { - my $file2 = file_absolutize($file); - my $dir = file_directory($file2); - "$wine_dir/$dir"; - }; - - my $indent; - my @comments = (); - my $format_comments = sub { - local $_ = ""; - if ($#comments == 0) { - my $comment = $comments[0]; - - $_ = "$indent/*$comment */"; - } elsif ($#comments > 0) { - $_ = "$indent/*\n"; - foreach my $comment (@comments) { - $_ .= "$indent *$comment\n"; - } - $_ .= "$indent */"; - } - $indent = ""; - @comments = (); - - return $_; - }; - - my $in_comment = 0; - my $modified = 0; - while (<IN>) { - chomp; - - if ($options->trailing_whitespace) { - s/(.*?)\s+$/$1/ && do { $modified = 1; }; - } else { - s/(.*?)\r$/$1/ && do { $modified = 1; }; - } - - if ($options->cpp_comments) { - if ($in_comment) { - if(/^.*?\*\//) { - $in_comment = 0; - } - } elsif (/^([^\"\/]*?(?:\"[^\"]*?\"[^\"]*?)*?)\/\*(.*?)$/) { - my $indent2 = $1; - my $comment = $2; - if($comment !~ /^.*?\*\//) { - $in_comment = 1; - } - } elsif (/^([^\"\/]*?(?:\"[^\"]*?\"[^\"]*?)*?)\/\/(.*?)\s*$/) { - my $indent2 = $1; - my $comment = $2; - - if ($indent2 =~ /^\s*$/) { - if (!$indent || $indent eq $indent2) { - $indent = $indent2; - push @comments, $comment; - next; - } else { - $_ .= "$indent2/*$comment */"; - } - } else { - my $comments = &$format_comments(); - if ($comments) { - $_ = "$comments\n$indent2/*$comment */"; - } else { - $_ = "$indent2/*$comment */"; - } - - $modified = 1; - } - } else { - my $comments = &$format_comments(); - if ($comments) { - $_ = "$comments\n$_"; - $modified = 1; - } - } - } - - if ($options->include_quotes) { - my $module = ""; - if ($dir =~ m%^$wine_dir/dlls/(.*?)/.*?$%) { - $module = $1; - } - - if (/^(\s*\#\s*include\s+)(?:<(.*?)>|\"(.*?)\")(.*?)\s*$/) { - my $prefix = $1; - my $header = $2 || $3; - my $local = !defined($2) && defined($3); - my $suffix = $4; - - my $exists_system = 0; { - my @system_paths = qw(/usr/include /usr/local/include /usr/X11R6/include); - foreach my $path (@system_paths) { - $exists_system ||= (-e "$path/$header" || 0); - } - $exists_system ||= $nativeapi->is_conditional_header($header); - } - - my $exists_windows = 0; { - if ($header !~ m%^wine/% && $header ne "config.h") { - $exists_windows ||= (-e "$wine_dir/include/$header" || 0); - } - } - - my $exists_wine = 0; { - $exists_wine ||= ($header eq "config.h"); - - if ($header =~ m%^wine/%) { - $exists_wine ||= (-e "$wine_dir/include/$header" || 0); - } - } - - my $exists_local = 0; { - $exists_local ||= ($header eq "y.tab.h"); - - my @local_paths = (); - push @local_paths, "$dir" if $dir !~ m%^$wine_dir/include%; - push @local_paths, "$wine_dir/dlls/$module" if $module; - foreach my $path (@local_paths) { - $exists_local ||= (-e "$path/$header" || 0); - } - } - - if (!$exists_system && !$exists_windows && !$exists_wine && !$exists_local) { - $output->write("warning: header '$header': doesn't exist\n"); - } elsif (($exists_system + $exists_windows + $exists_wine + $exists_local) > 1) { - if ($header !~ /^(?:async\.h|comcat\.h|sql(?:ext|types)?\.h|thread\.h|user\.h)$/) { - $output->write("warning: header '$header': more than one possibillity\n"); - } - } - - if (!$local && $exists_local) { - $_ = "$prefix\"$header\"$suffix"; - $modified = 1; - } elsif ($local && !$exists_local && ($exists_system || $exists_windows || $exists_wine)) { - $_ = "$prefix<$header>$suffix"; - $modified = 1; - } - } - } - - print OUT "$_\n"; - } - - my $comments = &$format_comments(); - if ($comments) { - print OUT "$comments\n"; - $modified = 1; - } - - return $modified; -} - -######################################################################## -# main - -my @h_files = $options->h_files; -my @c_files = $options->c_files; - -my $progress_output; -my $progress_current = 0; -my $progress_max = scalar(@h_files) + scalar(@c_files); - -foreach my $file (@h_files) { - $progress_current++; - $output->progress("$file (file $progress_current of $progress_max)"); - $output->prefix("$file: "); - - if (edit_file($file, \&cleanup_file, @_, $file)) { - $output->write("$file: modified\n"); - } -} - -foreach my $file (@c_files) { - $progress_current++; - $output->progress("$file (file $progress_current of $progress_max)"); - $output->prefix("$file: "); - - if (edit_file($file, \&cleanup_file, $file)) { - $output->write("$file: modified\n"); - } -} diff --git a/tools/winapi/winapi_cleanup_options.pm b/tools/winapi/winapi_cleanup_options.pm deleted file mode 100644 index f6019da..0000000 --- a/tools/winapi/winapi_cleanup_options.pm +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright 2002 Patrik Stridvall -# -# 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 -# - -package winapi_cleanup_options; -use base qw(options); - -use strict; - -use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); -require Exporter; - -(a)ISA = qw(Exporter); -(a)EXPORT = qw(); -(a)EXPORT_OK = qw($options); - -use options qw($options); - -my %options_long = ( - "debug" => { default => 0, description => "debug mode" }, - "help" => { default => 0, description => "help mode" }, - "verbose" => { default => 0, description => "verbose mode" }, - - "progress" => { default => 1, description => "show progress" }, - - "cpp-comments" => { default => 1, description => "convert C++ comments to C comments" }, - "include-quotes" => { default => 0, description => "convert #include \"\" to <> or the reverse where appropriate" }, - "trailing-whitespace" => { default => 0, description => "remove trailing whitespace" }, -); - -my %options_short = ( - "d" => "debug", - "?" => "help", - "v" => "verbose" -); - -my $options_usage = "usage: winapi_cleanup [--help] [<files>]\n"; - -$options = '_options'->new(\%options_long, \%options_short, $options_usage); - -1;

1 0

Francois Gouget : dplayx: DPLAYX_SetLocalSession() and DPLAYX_CopyIntoSessionDesc2A() are unused so remove them.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 185b4bf605baec7185794da46f76cb87f4e135d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=185b4bf605baec7185794da46… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:38:15 2009 +0200 dplayx: DPLAYX_SetLocalSession() and DPLAYX_CopyIntoSessionDesc2A() are unused so remove them. --- dlls/dplayx/dplayx_global.c | 43 ------------------------------------------- dlls/dplayx/dplayx_global.h | 2 -- dlls/dplayx/name_server.c | 4 ---- 3 files changed, 0 insertions(+), 49 deletions(-) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 9035902..d7f3cca 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -995,49 +995,6 @@ HRESULT DPLAYX_SetConnectionSettingsW return DP_OK; } - - -/* Copy an ANSI session desc structure to the given buffer */ -static BOOL DPLAYX_CopyIntoSessionDesc2A( LPDPSESSIONDESC2 lpSessionDest, - LPCDPSESSIONDESC2 lpSessionSrc ) -{ - CopyMemory( lpSessionDest, lpSessionSrc, sizeof( *lpSessionSrc ) ); - - if( lpSessionSrc->u1.lpszSessionNameA ) - { - if ((lpSessionDest->u1.lpszSessionNameA = HeapAlloc( GetProcessHeap(), 0, - strlen(lpSessionSrc->u1.lpszSessionNameA)+1 ))) - strcpy( lpSessionDest->u1.lpszSessionNameA, lpSessionSrc->u1.lpszSessionNameA ); - } - if( lpSessionSrc->u2.lpszPasswordA ) - { - if ((lpSessionDest->u2.lpszPasswordA = HeapAlloc( GetProcessHeap(), 0, - strlen(lpSessionSrc->u2.lpszPasswordA)+1 ))) - strcpy( lpSessionDest->u2.lpszPasswordA, lpSessionSrc->u2.lpszPasswordA ); - } - - return TRUE; -} - -void DPLAYX_SetLocalSession( LPCDPSESSIONDESC2 lpsd ) -{ - UINT i; - - /* FIXME: Is this an error if it exists already? */ - - /* Crude/wrong implementation for now. Just always add to first empty spot */ - for( i=0; i < numSupportedSessions; i++ ) - { - /* Is this one empty? */ - if( sessionData[i].dwSize == 0 ) - { - DPLAYX_CopyIntoSessionDesc2A( &sessionData[i], lpsd ); - break; - } - } - -} - BOOL DPLAYX_WaitForConnectionSettings( BOOL bWait ) { LPDPLAYX_LOBBYDATA lpLobbyData; diff --git a/dlls/dplayx/dplayx_global.h b/dlls/dplayx/dplayx_global.h index b9d48f4..5650348 100644 --- a/dlls/dplayx/dplayx_global.h +++ b/dlls/dplayx/dplayx_global.h @@ -51,8 +51,6 @@ BOOL DPLAYX_AnyLobbiesWaitingForConnSettings(void); BOOL DPLAYX_SetLobbyHandles( DWORD dwAppID, HANDLE hStart, HANDLE hDeath, HANDLE hConnRead ); -void DPLAYX_SetLocalSession( LPCDPSESSIONDESC2 lpsd ); - BOOL DPLAYX_SetLobbyMsgThreadId( DWORD dwAppId, DWORD dwThreadId ); diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index 58402cc..65d36ef 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -74,10 +74,6 @@ static DPQ_DECL_DELETECB( cbDeleteNSNodeFromHeap, lpNSCacheData ); */ void NS_SetLocalComputerAsNameServer( LPCDPSESSIONDESC2 lpsd, LPVOID lpNSInfo ) { -#if 0 - /* FIXME: Remove this method? */ - DPLAYX_SetLocalSession( lpsd ); -#endif lpNSCache lpCache = (lpNSCache)lpNSInfo; lpCache->bNsIsLocal = TRUE;

1 0

Francois Gouget : rsaenh: Make the mpi functions static, remove mp_signed_bin_size() as it is unused.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 53f3f441fb30045247651c1f23c5a62a77500a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f3f441fb30045247651c1f2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:39:18 2009 +0200 rsaenh: Make the mpi functions static, remove mp_signed_bin_size() as it is unused. --- dlls/rsaenh/mpi.c | 55 +++++++++++++++++++++++++++++++++++++++++------ dlls/rsaenh/tomcrypt.h | 46 ---------------------------------------- 2 files changed, 48 insertions(+), 53 deletions(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index 0c58e39..b1b1c9e 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -42,6 +42,53 @@ static const int KARATSUBA_MUL_CUTOFF = 88, /* Min. number of digits before Karatsuba multiplication is used. */ KARATSUBA_SQR_CUTOFF = 128; /* Min. number of digits before Karatsuba squaring is used. */ + +/* trim unused digits */ +static void mp_clamp(mp_int *a); + +/* compare |a| to |b| */ +static int mp_cmp_mag(const mp_int *a, const mp_int *b); + +/* Counts the number of lsbs which are zero before the first zero bit */ +static int mp_cnt_lsb(const mp_int *a); + +/* computes a = B**n mod b without division or multiplication useful for + * normalizing numbers in a Montgomery system. + */ +static int mp_montgomery_calc_normalization(mp_int *a, const mp_int *b); + +/* computes x/R == x (mod N) via Montgomery Reduction */ +static int mp_montgomery_reduce(mp_int *a, const mp_int *m, mp_digit mp); + +/* setups the montgomery reduction */ +static int mp_montgomery_setup(const mp_int *a, mp_digit *mp); + +/* Barrett Reduction, computes a (mod b) with a precomputed value c + * + * Assumes that 0 < a <= b*b, note if 0 > a > -(b*b) then you can merely + * compute the reduction as -1 * mp_reduce(mp_abs(a)) [pseudo code]. + */ +static int mp_reduce(mp_int *a, const mp_int *b, const mp_int *c); + +/* reduces a modulo b where b is of the form 2**p - k [0 <= a] */ +static int mp_reduce_2k(mp_int *a, const mp_int *n, mp_digit d); + +/* determines k value for 2k reduction */ +static int mp_reduce_2k_setup(const mp_int *a, mp_digit *d); + +/* used to setup the Barrett reduction for a given modulus b */ +static int mp_reduce_setup(mp_int *a, const mp_int *b); + +/* set to a digit */ +static void mp_set(mp_int *a, mp_digit b); + +/* b = a*a */ +static int mp_sqr(const mp_int *a, mp_int *b); + +/* c = a * a (mod b) */ +static int mp_sqrmod(const mp_int *a, mp_int *b, mp_int *c); + + static void bn_reverse(unsigned char *s, int len); static int s_mp_add(mp_int *a, mp_int *b, mp_int *c); static int s_mp_exptmod (const mp_int * G, const mp_int * X, mp_int * P, mp_int * Y); @@ -3589,7 +3636,7 @@ ERR: } /* determines the setup value */ -int +static int mp_reduce_2k_setup(const mp_int *a, mp_digit *d) { int res, p; @@ -3677,12 +3724,6 @@ int mp_shrink (mp_int * a) return MP_OKAY; } -/* get the size for an signed equivalent */ -int mp_signed_bin_size (const mp_int * a) -{ - return 1 + mp_unsigned_bin_size (a); -} - /* computes b = a*a */ int mp_sqr (const mp_int * a, mp_int * b) diff --git a/dlls/rsaenh/tomcrypt.h b/dlls/rsaenh/tomcrypt.h index aaaac98..49fb352 100644 --- a/dlls/rsaenh/tomcrypt.h +++ b/dlls/rsaenh/tomcrypt.h @@ -249,9 +249,6 @@ int mp_shrink(mp_int *a); #define mp_iseven(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 0)) ? MP_YES : MP_NO) #define mp_isodd(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 1)) ? MP_YES : MP_NO) -/* set to a digit */ -void mp_set(mp_int *a, mp_digit b); - /* set a 32-bit const */ int mp_set_int(mp_int *a, unsigned long b); @@ -270,14 +267,8 @@ int mp_copy(const mp_int *a, mp_int *b); /* inits and copies, a = b */ int mp_init_copy(mp_int *a, const mp_int *b); -/* trim unused digits */ -void mp_clamp(mp_int *a); - /* ---> digit manipulation <--- */ -/* Counts the number of lsbs which are zero before the first zero bit */ -int mp_cnt_lsb(const mp_int *a); - /* I Love Earth! */ /* makes a pseudo-random int of a given size */ @@ -301,9 +292,6 @@ int mp_neg(mp_int *a, mp_int *b); /* compare a to b */ int mp_cmp(const mp_int *a, const mp_int *b); -/* compare |a| to |b| */ -int mp_cmp_mag(const mp_int *a, const mp_int *b); - /* c = a + b */ int mp_add(mp_int *a, mp_int *b, mp_int *c); @@ -313,9 +301,6 @@ int mp_sub(mp_int *a, mp_int *b, mp_int *c); /* c = a * b */ int mp_mul(const mp_int *a, const mp_int *b, mp_int *c); -/* b = a*a */ -int mp_sqr(const mp_int *a, mp_int *b); - /* c = a mod b, 0 <= c < b */ int mp_mod(const mp_int *a, mp_int *b, mp_int *c); @@ -344,9 +329,6 @@ int mp_submod(mp_int *a, mp_int *b, mp_int *c, mp_int *d); /* d = a * b (mod c) */ int mp_mulmod(const mp_int *a, const mp_int *b, mp_int *c, mp_int *d); -/* c = a * a (mod b) */ -int mp_sqrmod(const mp_int *a, mp_int *b, mp_int *c); - /* c = 1/a (mod b) */ int mp_invmod(const mp_int *a, mp_int *b, mp_int *c); @@ -374,39 +356,12 @@ int mp_is_square(mp_int *arg, int *ret); /* computes the jacobi c = (a | n) (or Legendre if b is prime) */ int mp_jacobi(mp_int *a, mp_int *n, int *c); -/* used to setup the Barrett reduction for a given modulus b */ -int mp_reduce_setup(mp_int *a, const mp_int *b); - -/* Barrett Reduction, computes a (mod b) with a precomputed value c - * - * Assumes that 0 < a <= b*b, note if 0 > a > -(b*b) then you can merely - * compute the reduction as -1 * mp_reduce(mp_abs(a)) [pseudo code]. - */ -int mp_reduce(mp_int *a, const mp_int *b, const mp_int *c); - -/* setups the montgomery reduction */ -int mp_montgomery_setup(const mp_int *a, mp_digit *mp); - -/* computes a = B**n mod b without division or multiplication useful for - * normalizing numbers in a Montgomery system. - */ -int mp_montgomery_calc_normalization(mp_int *a, const mp_int *b); - -/* computes x/R == x (mod N) via Montgomery Reduction */ -int mp_montgomery_reduce(mp_int *a, const mp_int *m, mp_digit mp); - /* returns 1 if a is a valid DR modulus */ int mp_dr_is_modulus(mp_int *a); /* returns true if a can be reduced with mp_reduce_2k */ int mp_reduce_is_2k(mp_int *a); -/* determines k value for 2k reduction */ -int mp_reduce_2k_setup(const mp_int *a, mp_digit *d); - -/* reduces a modulo b where b is of the form 2**p - k [0 <= a] */ -int mp_reduce_2k(mp_int *a, const mp_int *n, mp_digit d); - /* d = a**b (mod c) */ int mp_exptmod(const mp_int *a, const mp_int *b, mp_int *c, mp_int *d); @@ -466,7 +421,6 @@ int mp_unsigned_bin_size(const mp_int *a); int mp_read_unsigned_bin(mp_int *a, const unsigned char *b, int c); int mp_to_unsigned_bin(const mp_int *a, unsigned char *b); -int mp_signed_bin_size(const mp_int *a); int mp_read_signed_bin(mp_int *a, unsigned char *b, int c); int mp_to_signed_bin(mp_int *a, unsigned char *b);

1 0

Francois Gouget : oleaut32: Tweak a comment to make it more explicit.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 97dea95e41310716310dda59064d950554d60590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97dea95e41310716310dda590… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:40:53 2009 +0200 oleaut32: Tweak a comment to make it more explicit. --- dlls/oleaut32/variant.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 909cf8a..37965f8 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -3009,7 +3009,7 @@ HRESULT WINAPI VarAnd(LPVARIANT left, LPVARIANT right, LPVARIANT result) { /* * Special cases for when left variant is VT_NULL - * (NULL & 0 = NULL, NULL & value = value) + * (VT_NULL & 0 = VT_NULL, VT_NULL & value = value) */ if (leftvt == VT_NULL) {

1 0