June 2010 - Wine-Commits - list.winehq.org

Francois Gouget : wordpad: Make print_preview() and preview_page_hittest() static.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: a413afa3e5ce02eca0f32574e82a6b23ce1c2e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a413afa3e5ce02eca0f32574e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 24 10:13:11 2010 +0200 wordpad: Make print_preview() and preview_page_hittest() static. --- programs/wordpad/print.c | 4 ++-- programs/wordpad/wordpad.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 1d4e6e3..231c90e 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -891,7 +891,7 @@ static void update_preview_buttons(HWND hMainWnd) EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_ZOOMOUT), preview.zoomlevel > 0); } -LRESULT print_preview(HWND hwndPreview) +static LRESULT print_preview(HWND hwndPreview) { HDC hdc; RECT window, background; @@ -1039,7 +1039,7 @@ static void toggle_num_pages(HWND hMainWnd) /* Returns the page shown that the point is in (1 or 2) or 0 if the point * isn't inside either page */ -int preview_page_hittest(POINT pt) +static int preview_page_hittest(POINT pt) { RECT rc; rc.left = preview.spacing.cx; diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index c250cc1..c3c5bc0 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -247,7 +247,6 @@ LRESULT preview_command(HWND, WPARAM); void init_preview(HWND, LPWSTR); void close_preview(HWND); BOOL preview_isactive(void); -LRESULT print_preview(HWND); void get_default_printer_opts(void); void registry_set_pagemargins(HKEY); void registry_read_pagemargins(HKEY);

1 0

Francois Gouget : gdiplus: Make measure_ranges_callback() static.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: a56375fcb56d9bef8d510d43e03a581683c2488f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a56375fcb56d9bef8d510d43e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 24 10:12:48 2010 +0200 gdiplus: Make measure_ranges_callback() static. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 68e422e..da3c15f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3653,7 +3653,7 @@ struct measure_ranges_args { GpRegion **regions; }; -GpStatus measure_ranges_callback(GpGraphics *graphics, +static GpStatus measure_ranges_callback(GpGraphics *graphics, GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, INT lineno, const RectF *bounds, void *user_data)

1 0

Francois Gouget : d3dxof: Make fdi_{alloc,free}() static.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: e6b907b7b388e5468b093868d5e2796dd9554161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6b907b7b388e5468b093868d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 24 10:12:31 2010 +0200 d3dxof: Make fdi_{alloc,free}() static. --- dlls/d3dxof/mszip.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/mszip.c b/dlls/d3dxof/mszip.c index 73fa848..1796616 100644 --- a/dlls/d3dxof/mszip.c +++ b/dlls/d3dxof/mszip.c @@ -607,12 +607,12 @@ static int ZIPfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state) return DECR_OK; } -void * __cdecl fdi_alloc(ULONG cb) +static void * __cdecl fdi_alloc(ULONG cb) { return HeapAlloc(GetProcessHeap(), 0, cb); } -void __cdecl fdi_free(void *pv) +static void __cdecl fdi_free(void *pv) { HeapFree(GetProcessHeap(), 0, pv); }

1 0

Francois Gouget : winecfg: The winecfg debug channel is unused so remove it .
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: c5bd7e4eb62db23ba2834540727348722ec59b89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bd7e4eb62db23ba28345407… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 24 10:18:26 2010 +0200 winecfg: The winecfg debug channel is unused so remove it. --- programs/winecfg/about.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/about.c b/programs/winecfg/about.c index b8a6964..d6b2a7d 100644 --- a/programs/winecfg/about.c +++ b/programs/winecfg/about.c @@ -29,12 +29,10 @@ #include <windows.h> #include <commctrl.h> #include <shellapi.h> -#include <wine/debug.h> #include "resource.h" #include "winecfg.h" -WINE_DEFAULT_DEBUG_CHANNEL(winecfg); static HICON logo = NULL; static HFONT titleFont = NULL;

1 0

Francois Gouget : d3dx9_36: Make assemble_shader() static.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: 3133b71e9257f505f3658a7d0d93aed36d66be84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3133b71e9257f505f3658a7d0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 24 10:12:41 2010 +0200 d3dx9_36: Make assemble_shader() static. --- dlls/d3dx9_36/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 3a7824a..9677e0b 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -382,7 +382,7 @@ static int wpp_close_output(void) return 1; } -HRESULT assemble_shader(const char *preprocShader, const char *preprocMessages, +static HRESULT assemble_shader(const char *preprocShader, const char *preprocMessages, LPD3DXBUFFER* ppShader, LPD3DXBUFFER* ppErrorMsgs) { struct bwriter_shader *shader;

1 0

Francois Gouget : kernel32: GetProcessDword() is unused so remove it.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: 7bf45b4c358e6dbc2e9ee9798daae7e196873038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf45b4c358e6dbc2e9ee9798… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 24 10:13:52 2010 +0200 kernel32: GetProcessDword() is unused so remove it. We use krnl386.exe16's implementation instead. --- dlls/kernel32/process.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index cc2a6ba..1e4a6e1 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2637,16 +2637,6 @@ DWORD WINAPI GetProcessFlags( DWORD processid ) } -/*********************************************************************** - * GetProcessDword (KERNEL32.18) - */ -DWORD WINAPI GetProcessDword( DWORD dwProcessID, INT offset ) -{ - FIXME( "(%d, %d): not supported\n", dwProcessID, offset ); - return 0; -} - - /********************************************************************* * OpenProcess (KERNEL32.@) *

1 0

Francois Gouget : usbd.sys: Fix the test for type control endpoints.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: 3c58b1a6f699f308780900223a841df84da5dcad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c58b1a6f699f308780900223… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 24 10:17:22 2010 +0200 usbd.sys: Fix the test for type control endpoints. The value of USB_ENDPOINT_TYPE_CONTROL is 0 so and-ing with it makes no sense. --- dlls/usbd.sys/usbd.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c index 4727512..80fd02e 100644 --- a/dlls/usbd.sys/usbd.c +++ b/dlls/usbd.sys/usbd.c @@ -125,14 +125,21 @@ PURB WINAPI USBD_CreateConfigurationRequestEx( interfaceInfo->Pipes[i].MaximumPacketSize = endpointDescriptor->wMaxPacketSize; interfaceInfo->Pipes[i].EndpointAddress = endpointDescriptor->bEndpointAddress; interfaceInfo->Pipes[i].Interval = endpointDescriptor->bInterval; - if (endpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_CONTROL) + switch (endpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK) + { + case USB_ENDPOINT_TYPE_CONTROL: interfaceInfo->Pipes[i].PipeType = UsbdPipeTypeControl; - else if (endpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_BULK) + break; + case USB_ENDPOINT_TYPE_BULK: interfaceInfo->Pipes[i].PipeType = UsbdPipeTypeBulk; - else if (endpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_INTERRUPT) + break; + case USB_ENDPOINT_TYPE_INTERRUPT: interfaceInfo->Pipes[i].PipeType = UsbdPipeTypeInterrupt; - else if (endpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_ISOCHRONOUS) + break; + case USB_ENDPOINT_TYPE_ISOCHRONOUS: interfaceInfo->Pipes[i].PipeType = UsbdPipeTypeIsochronous; + break; + } endpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR) USBD_ParseDescriptors( ConfigurationDescriptor, ConfigurationDescriptor->wTotalLength, endpointDescriptor + 1, USB_ENDPOINT_DESCRIPTOR_TYPE );

1 0

Gustavo Henrique Milaré : wordpad: Fix Portuguese translation.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: 49c685e43afb0535923dfcf415d661e2c49adfa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c685e43afb0535923dfcf41… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Wed Jun 23 16:16:56 2010 -0300 wordpad: Fix Portuguese translation. --- programs/wordpad/Pt.rc | 39 +++++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 16 deletions(-) diff --git a/programs/wordpad/Pt.rc b/programs/wordpad/Pt.rc index b7f9c52..2bc44fe 100644 --- a/programs/wordpad/Pt.rc +++ b/programs/wordpad/Pt.rc @@ -310,33 +310,33 @@ BEGIN STRING_ALL_FILES, "Todos os documentos (*.*)" END -STRINGTABLE DISCARDABLE -BEGIN - STRING_ALIGN_LEFT, "Esquerda" - STRING_ALIGN_RIGHT, "Direita" - STRING_ALIGN_CENTER, "Centro" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_NEWFILE_RICHTEXT, "Documento rich text" - STRING_NEWFILE_TXT, "Documento de texto" - STRING_NEWFILE_TXT_UNICODE, "Documento de texto Unicode" -END - LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE BEGIN - STRING_PRINTER_FILES_PRN, "Arquivos de impressora (*.PRN)" + STRING_ALL_FILES, "Todos os documentos (*.*)" + STRING_TEXT_FILES_TXT, "Documentos de texto (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Documentos de texto Unicode (*.txt)" + STRING_RICHTEXT_FILES_RTF, "Formato rich text (*.rtf)" + STRING_NEWFILE_RICHTEXT, "Documento rich text" + STRING_NEWFILE_TXT, "Documento de texto" + STRING_NEWFILE_TXT_UNICODE, "Documento de texto Unicode" + STRING_PRINTER_FILES_PRN, "Arquivos de impressora (*.PRN)" END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE DISCARDABLE BEGIN - STRING_PRINTER_FILES_PRN, "Ficheiros de impressora (*.PRN)" + STRING_ALL_FILES, "Todos os documentos (*.*)" + STRING_TEXT_FILES_TXT, "Documentos de texto (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Documentos de texto Unicode (*.txt)" + STRING_RICHTEXT_FILES_RTF, "Formato rich text (*.rtf)" + STRING_NEWFILE_RICHTEXT, "Documento rich text" + STRING_NEWFILE_TXT, "Documento de texto" + STRING_NEWFILE_TXT_UNICODE, "Documento de texto Unicode" + STRING_PRINTER_FILES_PRN, "Ficheiros de impressora (*.PRN)" END @@ -344,6 +344,13 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN + STRING_ALIGN_LEFT, "Esquerda" + STRING_ALIGN_RIGHT, "Direita" + STRING_ALIGN_CENTER, "Centro" +END + +STRINGTABLE DISCARDABLE +BEGIN STRING_VIEWPROPS_TITLE, "Opções" STRING_VIEWPROPS_TEXT, "Texto" STRING_VIEWPROPS_RICHTEXT, "Rich text"

1 0

Francois Gouget : shell32/tests: Make I{DataObject, ShellBrowser}Impl_Construct() static.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: 4898f6cb36c025c5296b0a78ccc846edf8938768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4898f6cb36c025c5296b0a78c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 24 10:10:24 2010 +0200 shell32/tests: Make I{DataObject,ShellBrowser}Impl_Construct() static. --- dlls/shell32/tests/shlview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index dc60a49..e3e0ef2 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -94,7 +94,7 @@ typedef struct { static const IDataObjectVtbl IDataObjectImpl_Vtbl; -IDataObject* IDataObjectImpl_Construct(void) +static IDataObject* IDataObjectImpl_Construct(void) { IDataObjectImpl *obj; @@ -216,7 +216,7 @@ typedef struct { static const IShellBrowserVtbl IShellBrowserImpl_Vtbl; -IShellBrowser* IShellBrowserImpl_Construct(void) +static IShellBrowser* IShellBrowserImpl_Construct(void) { IShellBrowserImpl *browser;

1 0

Akihiro Sagawa : jscript: Add Japanese translation.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: 496a7895d5b9a31e73667f0ad132565c5bc68b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=496a7895d5b9a31e73667f0ad… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jun 23 23:19:53 2010 +0900 jscript: Add Japanese translation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jscript_Ja.rc | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index b22e15d..56cf824 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -12,6 +12,7 @@ RC_SRCS = \ jscript_Es.rc \ jscript_Fr.rc \ jscript_It.rc \ + jscript_Ja.rc \ jscript_Ko.rc \ jscript_Lt.rc \ jscript_Nl.rc \ diff --git a/dlls/jscript/jscript_Ja.rc b/dlls/jscript/jscript_Ja.rc new file mode 100644 index 0000000..9751751 --- /dev/null +++ b/dlls/jscript/jscript_Ja.rc @@ -0,0 +1,51 @@ +/* + * Copyright 2009 Piotr Caban + * Copyright 2010 Akihiro Sagawa + * + * 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 + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TO_PRIMITIVE "オブジェクトを基本型に変換できません" + IDS_INVALID_CALL_ARG "手続き呼び出しまたは引数が無効です" + IDS_CREATE_OBJ_ERROR "オートメーションサーバはオブジェクトを生成できません" + IDS_NO_PROPERTY "オブジェクトはこのプロパティまたはメソッドをサポートしていません" + IDS_ARG_NOT_OPT "引数は省略できません" + IDS_SYNTAX_ERROR "文法エラー" + IDS_SEMICOLON "';'を期待していました" + IDS_LBRACKET "'('を期待していました" + IDS_RBRACKET "')'を期待していました" + IDS_UNTERMINATED_STR "文字列定数が終端していません" + IDS_NOT_FUNC "関数を期待していました" + IDS_NOT_DATE "'[object]' は日付オブジェクトではありません" + IDS_NOT_NUM "数値を期待していました" + IDS_OBJECT_EXPECTED "オブジェクトを期待していました" + IDS_ILLEGAL_ASSIGN "不正な割り当て" + IDS_UNDEFINED "'|'は定義されていません" + IDS_NOT_BOOL "論理オブジェクトを期待していました" + IDS_JSCRIPT_EXPECTED "JScriptオブジェクトを期待していました" + IDS_REGEXP_SYNTAX_ERROR "正規表現に文法誤りがあります" + IDS_URI_INVALID_CHAR "エンコードされるURIに無効な文字が含まれています" + IDS_INVALID_LENGTH "配列の長さは有限の正整数でなければなりません" + IDS_ARRAY_EXPECTED "配列オブジェクトを期待していました" +}

1 0