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

wordpad: Remove untranslated resources from the Chinese translation.
by Dylan Smith 23 Jun '10

23 Jun '10

--- programs/wordpad/Zh.rc | 24 ------------------------ 1 files changed, 0 insertions(+), 24 deletions(-) diff --git a/programs/wordpad/Zh.rc b/programs/wordpad/Zh.rc index 135f00c..bae40a7 100644 --- a/programs/wordpad/Zh.rc +++ b/programs/wordpad/Zh.rc @@ -111,30 +111,6 @@ BEGIN END END -IDM_COLOR_POPUP MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "Black", ID_COLOR_BLACK - MENUITEM "Maroon", ID_COLOR_MAROON - MENUITEM "Green", ID_COLOR_GREEN - MENUITEM "Olive" ID_COLOR_OLIVE - MENUITEM "Navy" ID_COLOR_NAVY - MENUITEM "Purple" ID_COLOR_PURPLE - MENUITEM "Teal" ID_COLOR_TEAL - MENUITEM "Gray" ID_COLOR_GRAY - MENUITEM "Silver" ID_COLOR_SILVER - MENUITEM "Red" ID_COLOR_RED - MENUITEM "Lime" ID_COLOR_LIME - MENUITEM "Yellow" ID_COLOR_YELLOW - MENUITEM "Blue" ID_COLOR_BLUE - MENUITEM "Fuchsia" ID_COLOR_FUCHSIA - MENUITEM "Aqua" ID_COLOR_AQUA - MENUITEM "White" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC - END -END - IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "日期和时间" -- 1.7.0.4

2 1

Re: oledlg: Add the Romanian translation.
by Alexandru Băluț 23 Jun '10

23 Jun '10

2010/6/23 Michael Stefaniuc <mstefani(a)redhat.com>: > + CONTROL "Creează un nou",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | > + WS_GROUP,7,20,67,10 "Creează nou" seems better, the original is "Create New", not "Create a New". I don't really get what "Create New" is supposed to mean, or what is the difference between the "Create New" and "Create Control", since for both you press the same button "Add Control...", so both actually create a Control. I might be wrong. > + PUSHBUTTON "&Adăugare control...",IDC_ADDCONTROL,81,88,67,14,NOT WS_VISIBLE This is a button, "&Adaugă [...]" seems more appropriate. "&Adaugă un control" would be consistent with "Creează un control" which is used for a radio button. > +CAPTION "Paste Special" It should say "Inserare specială", to be consistent with: > + CONTROL "I&nserează", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, > + CONTROL "Inserează &linkul", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, Is "Inserează &legătura" wrong? > + IDS_PS_PASTE_DATA "Inserează conținutul din clipboard în document ca %s." > + IDS_PS_PASTE_OBJECT "Inserează conținutul din clipboard în document astfel încât să îl puteți activa utilizând %s." > + IDS_PS_PASTE_OBJECT_AS_ICON "Inserează conținutul din clipboard în document astfel încât să îl puteți activa utilizând %s. Va fi afișat ca o pictogramă." > + IDS_PS_PASTE_LINK_DATA "Inserează conținutul din clipboard în document ca %s. Datele sunt legate de fișierul sursă, astfel încât modificările aduse fișierului vor fi reflectate în document." > + IDS_PS_PASTE_LINK_OBJECT "Inserați o imagine a conținutului din clipboard în document. Imaginea este legată de fișierul sursă, astfel încât modificările aduse fișierului vor fi reflectate în document." > + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Inserați o scurtătură care conduce la locația conținutului din clipboard. Scurtătura este legată de fișierul sursă, astfel încât modificările aduse fișierului vor fi reflectate în document." > + IDS_PS_NON_OLE "Inserează conținutul din clipboard în document." All the English messages for these start with "Inserts [...]" - We should be consistent, and use "Inserează [...]" for all of them. Thanks, Alex

2 2

Re: [PATCH] user32: check for valid pointer in CURSORICON_CreateIconFromBMI
by Alexandre Julliard 23 Jun '10

23 Jun '10

Wolfram Sang <wolfram(a)the-dreams.de> writes: > @@ -884,6 +884,10 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, > return 0; > } > > + /* A few Windows versions crash getting NULL, but most simply return it */ > + if (!bmi) > + return 0; That's not the right place for it, this is an internal function. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: Porting WIne to D
by Stephen Eilert 23 Jun '10

23 Jun '10

On Wed, Jun 23, 2010 at 3:06 PM, Christopher Selph <cds.wine(a)gmail.com> wrote: > Well, being a garbage collected language, it would help with the memory > leaks in Wine. Being OOP it could extend the design of the code to make it > cleaner and reusable. The assertions above are opinions, not facts. Also, it requires a full rewrite. Wine Initial release(per Wikipedia): 4 July 1993 Good luck. --Stephen Sent from my Emacs

2 1

Re: wordpad: Update Portuguese translation
by Gustavo 23 Jun '10

23 Jun '10

Yes, that's what I did. I just tested wordpad with the wrong order and noticed that choosing to create a new file showed a window with blank entries, and when trying to open a file the drowpdown file type menu was also blank. In the right order everything worked. In other words, I introduced a bug in Portuguese Wine :/ Cheers, Gustavo. 2010/6/23 Paul Vriens <paul.vriens.wine(a)gmail.com> > On 06/23/2010 09:19 PM, Gustavo wrote: > >> I found out the problem. It was the order of the definition of strings >> that >> was wrong. Committing a new patch. >> > > you mean you did it now like in the En.rc file? Tried that but that's not > the issue, although it's probably better to have the same list as the > English one just for consistency. > > -- > Cheers, > > Paul. >

2 2

Re: wordpad: Update Portuguese translation
by Paul Vriens 23 Jun '10

23 Jun '10

On 06/23/2010 03:12 PM, Gustavo wrote: > One more translation :) > This somehow messed up the stats: http://source.winehq.org/transl/resource.php?lang=016%3A02&resfile=programs… and http://source.winehq.org/transl/resource.php?lang=016%3A01&resfile=programs… It looks like we have two (sub)languages in one STRINGTABLE. Now, I'm not sure if that's allowed (I think it is because ResHacker doesn't have an issue with it) or if it's a wrc/transl bug/issue. -- Cheers, Paul.

2 1

Re: Add files generated by "make depend", PGO and gcov to .gitignore
by Peter Davies 23 Jun '10

23 Jun '10

Does this mean that "make depend" should be removed from README and ./tools/wineinstall? It generates /conf* files. Peter

2 2

Re: msvcrt: Implement getenv_s and _wgetenv_s, forwards from msvcr80, 90 and 100
by Piotr Caban 23 Jun '10

23 Jun '10

On 06/23/10 15:26, Paul Chitescu wrote: > /********************************************************************* > + * getenv_s - not exported in native msvcrt > + */ > +int CDECL getenv_s(size_t *size, char *buffer, size_t bufLen, const char *name Both getenv_s and _wgetenv_s are exported in native msvcrt. > + unsigned int len = strlen(var) + 1; > + *size = len; > + if (len > bufLen) > + return MSVCRT_ERANGE; If bufLen is set to 0 the function is used for obtaining output size. No ERANGE error is returned in this case. Cheers, Piotr

1 0

[PATCH 2/2] d3dx9: Add stub and basic test for D3DXCreateSphere.
by Misha Koshelev 23 Jun '10

23 Jun '10

FYI, I am following the current definition of D3DXCreateBox, which is in the mesh.c file. If you think I should start a separate (shape.c) file for these functions, please let me know. Prior patch fixed an #include which should have been present in d3dx9.h Starting work on http://bugs.winehq.org/show_bug.cgi?id=22918 implementing D3DXCreateSphere Thank you Misha p.s. Actually I remember I used to be quite into game programming many years ago - "Tricks of the Game Programming Gurus", even wrote my own Mode X library at one point ;) - not 3D though --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 8 ++++++++ dlls/d3dx9_36/tests/mesh.c | 9 +++++++++ include/d3dx9shape.h | 7 +++++++ 4 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 19406e7..b9a00da 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -87,7 +87,7 @@ @ stub D3DXCreateSkinInfo @ stub D3DXCreateSkinInfoFromBlendedMesh @ stub D3DXCreateSkinInfoFVF -@ stub D3DXCreateSphere +@ stdcall D3DXCreateSphere(ptr long long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stub D3DXCreateTeapot @ stub D3DXCreateTextA diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 9691eed..5611030 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -335,3 +335,11 @@ HRESULT WINAPI D3DXCreateBox(LPDIRECT3DDEVICE9 device, FLOAT width, FLOAT height return E_NOTIMPL; } + +HRESULT WINAPI D3DXCreateSphere(LPDIRECT3DDEVICE9 device, FLOAT radius, UINT slices, + UINT stacks, LPD3DXMESH* mesh, LPD3DXBUFFER* adjacency) +{ + FIXME("(%p, %f, %d, %d, %p, %p): stub\n", device, radius, slices, stacks, mesh, adjacency); + + return E_NOTIMPL; +} diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 8e4e26d..0086bb3 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -476,6 +476,14 @@ static void D3DXIntersectTriTest(void) ok( got_res == exp_res, "Expected result = %d, got %d\n",exp_res,got_res); } +static void D3DXCreateSphereTest(void) +{ + HRESULT hr; + + hr = D3DXCreateSphere(NULL, 0.0, 0, 0, NULL, NULL); + todo_wine ok( hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n",hr,D3DERR_INVALIDCALL); +} + static void test_get_decl_vertex_size(void) { static const D3DVERTEXELEMENT9 declaration1[] = @@ -556,5 +564,6 @@ START_TEST(mesh) D3DXDeclaratorFromFVFTest(); D3DXGetFVFVertexSizeTest(); D3DXIntersectTriTest(); + D3DXCreateSphereTest(); test_get_decl_vertex_size(); } diff --git a/include/d3dx9shape.h b/include/d3dx9shape.h index e1bf231..36bca6b 100644 --- a/include/d3dx9shape.h +++ b/include/d3dx9shape.h @@ -32,6 +32,13 @@ HRESULT WINAPI D3DXCreateBox(LPDIRECT3DDEVICE9 device, LPD3DXMESH* mesh, LPD3DXBUFFER* adjacency); +HRESULT WINAPI D3DXCreateSphere(LPDIRECT3DDEVICE9 device, + FLOAT radius, + UINT slices, + UINT stacks, + LPD3DXMESH* mesh, + LPD3DXBUFFER* adjacency); + #ifdef __cplusplus } #endif -- 1.7.1

3 5

Re: avifil32: Update Portuguese (Brazilian) translation
by Ricardo Filipe 23 Jun '10

23 Jun '10

2010/6/23 Gustavo <gugamilare(a)gmail.com>: > Updated Brazilian Portuguese translation and changed codification of > resource file to UTF-8 > > > > hi gustavo! thanks for doing the .br translations, and fixing sizes i overlooked in the .pt translation. :) however, you need to add the following line to the beginning of the file when you change encoding to UTF-8: #pragma code_page(65001) there are several resources where you can see that example. keep up the good work, ricardo

2 1