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

Misha Koshelev : include: Include d3dx9shape.h in d3dx9.h.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 6882287b97cf9401e5a5eee032bb4bf26e904ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6882287b97cf9401e5a5eee03… Author: Misha Koshelev <misha680(a)gmail.com> Date: Tue Jun 22 22:56:23 2010 -0500 include: Include d3dx9shape.h in d3dx9.h. --- include/d3dx9.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/d3dx9.h b/include/d3dx9.h index ccf731e..09ae553 100644 --- a/include/d3dx9.h +++ b/include/d3dx9.h @@ -33,6 +33,7 @@ #include "d3dx9mesh.h" #include "d3dx9shader.h" #include "d3dx9effect.h" +#include "d3dx9shape.h" #include "d3dx9tex.h" #define _FACDD 0x876

1 0

Jörg Höhle : mmsystem: Handle WAVE_FORMAT_QUERY case.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 64742c99fc7b2e250f6c97106ed23344ca308508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64742c99fc7b2e250f6c97106… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jun 23 06:57:57 2010 +0200 mmsystem: Handle WAVE_FORMAT_QUERY case. --- dlls/mmsystem.dll16/mmsystem.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index e9f2b3a..1109ef4 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -1257,11 +1257,10 @@ UINT16 WINAPI waveOutOpen16(HWAVEOUT16* lphWaveOut, UINT16 uDeviceID, ret = waveOutOpen(&hWaveOut, (uDeviceID == (UINT16)-1) ? (UINT)-1 : uDeviceID, lpFormat, (DWORD)thunk, dwInstance, dwFlags); - if (ret == MMSYSERR_NOERROR) - { - if (lphWaveOut != NULL) *lphWaveOut = HWAVEOUT_16(hWaveOut); - MMSYSTDRV_SetHandle(thunk, (void*)hWaveOut); - } + if (lphWaveOut != NULL && ret == MMSYSERR_NOERROR) + *lphWaveOut = HWAVEOUT_16(hWaveOut); + if (ret == MMSYSERR_NOERROR && !(dwFlags & WAVE_FORMAT_QUERY)) + MMSYSTDRV_SetHandle(thunk, (void*)hWaveOut); else MMSYSTDRV_DeleteThunk(thunk); return ret; } @@ -1550,11 +1549,10 @@ UINT16 WINAPI waveInOpen16(HWAVEIN16* lphWaveIn, UINT16 uDeviceID, ret = waveInOpen(&hWaveIn, (uDeviceID == (UINT16)-1) ? (UINT)-1 : uDeviceID, lpFormat, (DWORD)thunk, dwInstance, dwFlags); - if (ret == MMSYSERR_NOERROR) - { - if (lphWaveIn != NULL) *lphWaveIn = HWAVEIN_16(hWaveIn); - MMSYSTDRV_SetHandle(thunk, (void*)hWaveIn); - } + if (lphWaveIn != NULL && ret == MMSYSERR_NOERROR) + *lphWaveIn = HWAVEIN_16(hWaveIn); + if (ret == MMSYSERR_NOERROR && !(dwFlags & WAVE_FORMAT_QUERY)) + MMSYSTDRV_SetHandle(thunk, (void*)hWaveIn); else MMSYSTDRV_DeleteThunk(thunk); return ret; }

1 0

André Hentschel : winetest: Implement aborting.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: bee78503449c4175e4e2731dc70cecbfd3d6ea15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bee78503449c4175e4e2731dc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 22 19:36:08 2010 +0200 winetest: Implement aborting. --- programs/winetest/gui.c | 3 ++- programs/winetest/main.c | 11 +++++++++++ programs/winetest/winetest.h | 1 + 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c index 45b3232..a9f3465 100644 --- a/programs/winetest/gui.c +++ b/programs/winetest/gui.c @@ -456,7 +456,8 @@ DlgProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) MAKEINTRESOURCE (IDD_ABOUT), hwnd, AboutProc); return TRUE; case IDABORT: - report (R_WARNING, "Not implemented"); + report (R_STATUS, "Aborting, please wait..."); + aborting = TRUE; return TRUE; } } diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 01217d2..f5bf8d4 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -49,6 +49,7 @@ struct wine_test char *tag = NULL; char *email = NULL; +BOOL aborting = FALSE; static struct wine_test *wine_tests; static int nr_of_files, nr_of_tests; static int nr_native_dlls; @@ -677,6 +678,7 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, HMODULE dll; DWORD err; + if (aborting) return TRUE; if (test_filtered_out( lpszName, NULL )) return TRUE; /* Check if the main dll is present on this system */ @@ -840,6 +842,8 @@ run_tests (char *logname, char *outdir) FreeLibrary(hmscoree); + if (aborting) return logname; + xprintf ("Test output:\n" ); report (R_DELTA, 0, "Extracting: Done"); @@ -853,12 +857,15 @@ run_tests (char *logname, char *outdir) struct wine_test *test = wine_tests + i; int j; + if (aborting) break; + if (test->maindllpath) { /* We need to add the path (to the main dll) to PATH */ append_path(test->maindllpath); } for (j = 0; j < test->subtest_count; j++) { + if (aborting) break; report (R_STEP, "Running: %s:%s", test->name, test->subtests[j]); run_test (test, test->subtests[j], logfile, tempdir); @@ -1105,6 +1112,10 @@ int main( int argc, char *argv[] ) if (!logname) { logname = run_tests (NULL, outdir); + if (aborting) { + DeleteFileA(logname); + exit (0); + } if (build_id[0] && !nb_filters && !nr_native_dlls && report (R_ASK, MB_YESNO, "Do you want to submit the test results?") == IDYES) if (!send_file (logname) && !DeleteFileA(logname)) diff --git a/programs/winetest/winetest.h b/programs/winetest/winetest.h index a0d2fbd..2b9046c 100644 --- a/programs/winetest/winetest.h +++ b/programs/winetest/winetest.h @@ -69,6 +69,7 @@ enum report_type { #define MAXTAGLEN 20 extern char *tag; extern char *email; +extern BOOL aborting; int guiAskTag (void); int guiAskEmail (void); int report (enum report_type t, ...);

1 0

Dmitry Timoshkov : comctl32: Add a bunch of imagelist storage tests, make them pass under Wine.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 1066194f94b59ba4df249e0dcfa9e0da6e4c6f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1066194f94b59ba4df249e0dc… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 23 17:57:39 2010 +0900 comctl32: Add a bunch of imagelist storage tests, make them pass under Wine. --- dlls/comctl32/imagelist.c | 8 +- dlls/comctl32/tests/imagelist.c | 187 +++++++++++++++++++++++++++++++------- 2 files changed, 156 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1066194f94b59ba4df249…

1 0

Michael Stefaniuc : hhctrl.ocx: Add the Romanian translation.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: fb5ef1c6c648ad443b3fdc4015f7cd5bd0cff548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb5ef1c6c648ad443b3fdc401… Author: Michael Stefaniuc <mstefani(a)redhat.com> Date: Wed Jun 23 01:14:28 2010 +0200 hhctrl.ocx: Add the Romanian translation. Translation by Claudia Cotună. --- dlls/hhctrl.ocx/Makefile.in | 1 + dlls/hhctrl.ocx/Ro.rc | 63 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index 5561f42..1dd511b 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -34,6 +34,7 @@ RC_SRCS = \ No.rc \ Pl.rc \ Pt.rc \ + Ro.rc \ Ru.rc \ Si.rc \ Sv.rc \ diff --git a/dlls/hhctrl.ocx/Ro.rc b/dlls/hhctrl.ocx/Ro.rc new file mode 100644 index 0000000..28f7569 --- /dev/null +++ b/dlls/hhctrl.ocx/Ro.rc @@ -0,0 +1,63 @@ +/* + * HTML Help resources + * + * Copyright 2005 James Hawkins + * Copyright 2010 Claudia Cotună + * Michael Stefaniuc + * + * 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" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE +BEGIN + IDS_CONTENTS "&Cuprins" + IDS_INDEX "I&ndex" + IDS_SEARCH "C&aută" + IDS_FAVORITES "Favor&ite" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "Afișează" + IDTB_CONTRACT "Ascunde" + IDTB_STOP "Oprește" + IDTB_REFRESH "Actualizează" + IDTB_BACK "Înapoi" + IDTB_HOME "Acasă" + IDTB_SYNC "Sincronizează" + IDTB_PRINT "Imprimă" + IDTB_OPTIONS "Opțiuni" + IDTB_FORWARD "Înainte" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "Salt1" + IDTB_JUMP2 "Salt2" + IDTB_CUSTOMIZE "Personalizare" + IDTB_ZOOM "Zoom" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END

1 0

Aric Stewart : shlwapi: URL_FILE_USE_PATHURL flag only unescapes file urls in UrlCanonicalize.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: ea029bd2fb3754ea1c30e41e1a4c6cb770f4c9e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea029bd2fb3754ea1c30e41e1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 23 15:47:35 2010 +0900 shlwapi: URL_FILE_USE_PATHURL flag only unescapes file urls in UrlCanonicalize. --- dlls/shlwapi/tests/url.c | 4 +++- dlls/shlwapi/url.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index c828ea9..8a8f68a 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -160,7 +160,9 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"A", 0, S_OK, "A", FALSE}, {"/uri-res/N2R?urn:sha1:B3K", URL_DONT_ESCAPE_EXTRA_INFO | URL_WININET_COMPATIBILITY /*0x82000000*/, S_OK, "/uri-res/N2R?urn:sha1:B3K", FALSE} /*LimeWire online installer calls this*/, {"http:www.winehq.org/dir/../index.html", 0, S_OK, "http:www.winehq.org/index.html"}, - {"http://localhost/test.html", URL_FILE_USE_PATHURL, S_OK, "http://localhost/test.html"} + {"http://localhost/test.html", URL_FILE_USE_PATHURL, S_OK, "http://localhost/test.html"}, + {"http://localhost/te%20st.html", URL_FILE_USE_PATHURL, S_OK, "http://localhost/te%20st.html"}, + {"http://www.winehq.org/%E6%A1%9C.html", URL_FILE_USE_PATHURL, S_OK, "http://www.winehq.org/%E6%A1%9C.html"} }; /* ################ */ diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index ad7d989..d7a36db 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -486,7 +486,9 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, while ((nLen > 0) && ((lpszUrlCpy[nLen-1] <= ' '))) lpszUrlCpy[--nLen]=0; - if(dwFlags & (URL_UNESCAPE | URL_FILE_USE_PATHURL)) + if((dwFlags & URL_UNESCAPE) || + ((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszFile) + && !memcmp(wszFile, pszUrl, sizeof(wszFile)))) UrlUnescapeW(lpszUrlCpy, NULL, &nLen, URL_UNESCAPE_INPLACE); if((EscapeFlags = dwFlags & (URL_ESCAPE_UNSAFE |

1 0

Michael Stefaniuc : net: Add the Romanian translation.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: dbf5ec01aea564bf230da144fc4b714962a12915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbf5ec01aea564bf230da144f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 23 10:34:21 2010 +0200 net: Add the Romanian translation. Translation by Claudia Cotună. --- programs/net/Makefile.in | 1 + programs/net/Ro.rc | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in index 5c06bb8..5efbef0 100644 --- a/programs/net/Makefile.in +++ b/programs/net/Makefile.in @@ -21,6 +21,7 @@ RC_SRCS = \ No.rc \ Pl.rc \ Pt.rc \ + Ro.rc \ Ru.rc \ Si.rc diff --git a/programs/net/Ro.rc b/programs/net/Ro.rc new file mode 100644 index 0000000..9dc52f7 --- /dev/null +++ b/programs/net/Ro.rc @@ -0,0 +1,48 @@ +/* + * NET.EXE - Wine-compatible net program + * + * Copyright (C) 2007 Tim Schwartz + * Copyright (C) 2010 Claudia Cotună + * Michael Stefaniuc + * + * 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 "resources.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE +{ + STRING_USAGE, "Sintaxa acestei comenzi este:\n\nNET [ HELP | START | STOP | USE ]\n" + STRING_START_USAGE, "Specificați numele serviciului de pornit.\n" + STRING_STOP_USAGE, "Specificați numele serviciului de oprit.\n" + STRING_STOP_DEP, "Se oprește serviciul dependent: %s\n" + STRING_CANT_STOP, "Serviciul %s nu a putut fi oprit\n" + STRING_NO_SCM, "Nu a putut fi accesat managerul de control al serviciului.\n" + STRING_NO_SVCHANDLE, "Serviciul nu a putut fi accesat.\n" + STRING_START_SVC, "Serviciul %s pornește.\n" + STRING_START_SVC_SUCCESS, "Serviciul %s a fost pornit cu succes.\n" + STRING_START_SVC_FAIL, "Pornirea serviciului %s a eșuat.\n" + STRING_STOP_SVC, "Serviciul %s se oprește.\n" + STRING_STOP_SVC_SUCCESS, "Serviciul %s a fost oprit cu succes.\n" + STRING_STOP_SVC_FAIL, "Oprirea serviciului %s a eșuat.\n" + STRING_HELP_USAGE, "Sintaxa acestei comenzi este:\n\ncomandă NET HELP\n -sau-\ncomandă NET /HELP\n\n Comenzile disponibile sunt:\n NET HELP NET START NET STOP NET USE\n" + STRING_NO_ENTRIES, "Nu există nici un element în listă.\n" + STRING_USE_HEADER, "\nStare Local Distant\n---------------------------------------------------------------\n" + STRING_USE_ENTRY, "%s %S %S Resurse deschise: %lu\n" +}

1 0

Alexandre Julliard : user32/tests: Fix some DDE test failures on Win9x.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: fe161ec2f906c62c4e718770cc479b4af1744887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe161ec2f906c62c4e718770c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 23 15:22:29 2010 +0200 user32/tests: Fix some DDE test failures on Win9x. --- dlls/user32/tests/dde.c | 60 ++++++++++++++++++++++++++++++---------------- 1 files changed, 39 insertions(+), 21 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 040c11a..8ead6d2 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -162,7 +162,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA lstrcpyA((LPSTR)data->Value, str); GlobalUnlock(hglobal); - lparam = PackDDElParam(WM_DDE_ACK, (UINT_PTR)hglobal, HIWORD(lparam)); + lparam = PackDDElParam(WM_DDE_DATA, (UINT_PTR)hglobal, HIWORD(lparam)); PostMessageA(client, WM_DDE_DATA, (WPARAM)hwnd, lparam); break; @@ -188,7 +188,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA if (msg_index == 5) { size = GlobalSize((HGLOBAL)lo); - ok(size == 4, "got %d\n", size); + ok(size == 4 || broken(size == 32), /* sizes are rounded up on win9x */ "got %d\n", size); } else ok(!lstrcmpA((LPSTR)poke->Value, "poke data\r\n"), @@ -230,6 +230,11 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA break; } + case WM_DDE_ACK: /* happens on win9x when fAckReq is TRUE, ignore it */ + ok(msg_index == 4, "Expected 4, got %d\n", msg_index); + msg_index--; + break; + default: ok(FALSE, "Unhandled msg: %08x\n", msg); } @@ -300,14 +305,15 @@ static void test_ddeml_client(void) hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); ret = DdeGetLastError(client_pid); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); - ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %08x\n", res); - if (hdata == NULL) - ok(FALSE, "hdata is NULL\n"); - else + ok(res == DDE_FNOTPROCESSED || broken(res == 0xdeadbeef), /* win9x */ + "Expected DDE_FNOTPROCESSED, got %08x\n", res); + ok( hdata != NULL, "hdata is NULL\n" ); + if (hdata) { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19, "Expected 19, got %d\n", size); + ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */ + "Expected 19, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -318,16 +324,18 @@ static void test_ddeml_client(void) DdeGetLastError(client_pid); hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); ret = DdeGetLastError(client_pid); - ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res); + ok(res == DDE_FNOTPROCESSED || broken(res == 0xdeadbeef), /* win9x */ + "Expected DDE_FNOTPROCESSED, got %x\n", res); todo_wine - ok(ret == DMLERR_MEMORY_ERROR, "Expected DMLERR_MEMORY_ERROR, got %d\n", ret); - if (hdata == NULL) - ok(FALSE, "hdata is NULL\n"); - else + ok(ret == DMLERR_MEMORY_ERROR || broken(ret == 0), /* win9x */ + "Expected DMLERR_MEMORY_ERROR, got %d\n", ret); + ok( hdata != NULL, "hdata is NULL\n" ); + if (hdata) { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19, "Expected 19, got %d\n", size); + ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */ + "Expected 19, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -339,14 +347,16 @@ todo_wine hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); ret = DdeGetLastError(client_pid); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); - ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res); + ok(res == DDE_FNOTPROCESSED || broken(res == 0xdeadbeef), /* win9x */ + "Expected DDE_FNOTPROCESSED, got %x\n", res); if (hdata == NULL) ok(FALSE, "hdata is NULL\n"); else { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19, "Expected 19, got %d\n", size); + ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */ + "Expected 19, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -394,7 +404,7 @@ todo_wine op = DdeClientTransaction((LPBYTE)hdata, 0, conversation, item, CF_TEXT, XTYP_POKE, default_timeout, &res); ret = DdeGetLastError(client_pid); ok(op == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", op); - ok(res == DDE_FACK, "Expected DDE_FACK, got %d\n", res); + ok(res == DDE_FACK || broken(res == 0xdeadbeef), /* win9x */ "Expected DDE_FACK, got %x\n", res); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); /* XTYP_POKE, correct params */ @@ -403,7 +413,8 @@ todo_wine op = DdeClientTransaction((LPBYTE)hdata, -1, conversation, item, CF_TEXT, XTYP_POKE, default_timeout, &res); ret = DdeGetLastError(client_pid); ok(op == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", op); - ok(res == DDE_FACK, "Expected DDE_FACK, got %d\n", res); + ok(res == DDE_FACK || broken(res == (0xdead0000 | DDE_FACK)), /* win9x */ + "Expected DDE_FACK, got %x\n", res); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); DdeFreeDataHandle(hdata); @@ -420,7 +431,7 @@ todo_wine ret = DdeGetLastError(client_pid); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); ok(op == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", op); - ok(res == DDE_FACK, "Expected DDE_FACK, got %d\n", res); + ok(res == DDE_FACK || broken(res == 0xdeadbeef), /* win9x */ "Expected DDE_FACK, got %x\n", res); /* XTYP_EXECUTE, no data */ res = 0xdeadbeef; @@ -585,9 +596,16 @@ static HDDEDATA CALLBACK server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon ok(size == 13, "Expected 13, got %d\n", size); size = DdeQueryStringA(server_pid, hsz2, str, MAX_PATH, CP_WINANSI); - ok(!strncmp(str, "TestDDEServer(", 14), "Expected TestDDEServer(, got %s\n", str); - ok(str[size - 1] == ')', "Expected ')', got %c\n", str[size - 1]); - ok(size == 17 + 2*sizeof(ULONG_PTR), "Got size %d for %s\n", size, str); + if (!strncmp( str, "TestDDEServer:(", 15 )) /* win9x style */ + { + ok(size == 16 + 2*sizeof(WORD), "Got size %d for %s\n", size, str); + } + else + { + ok(!strncmp(str, "TestDDEServer(", 14), "Expected TestDDEServer(, got %s\n", str); + ok(size == 17 + 2*sizeof(ULONG_PTR), "Got size %d for %s\n", size, str); + } + ok(str[size - 1] == ')', "Expected ')', got %c\n", str[size - 1]); return (HDDEDATA)TRUE; }

1 0

Michael Stefaniuc : gphoto.ds: Add the Romanian translation.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 65cebf3ae23b89b67d3861231d317f2017fef068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65cebf3ae23b89b67d3861231… Author: Michael Stefaniuc <mstefani(a)redhat.com> Date: Wed Jun 23 01:14:48 2010 +0200 gphoto.ds: Add the Romanian translation. Translation by Claudia Cotună. --- dlls/gphoto2.ds/Makefile.in | 1 + dlls/gphoto2.ds/gphoto2_Ro.rc | 57 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in index 63d1b68..5cbde22 100644 --- a/dlls/gphoto2.ds/Makefile.in +++ b/dlls/gphoto2.ds/Makefile.in @@ -27,6 +27,7 @@ RC_SRCS = \ gphoto2_No.rc \ gphoto2_Pl.rc \ gphoto2_Pt.rc \ + gphoto2_Ro.rc \ gphoto2_Ru.rc \ gphoto2_Si.rc \ gphoto2_Sv.rc \ diff --git a/dlls/gphoto2.ds/gphoto2_Ro.rc b/dlls/gphoto2.ds/gphoto2_Ro.rc new file mode 100644 index 0000000..9cfe1b2 --- /dev/null +++ b/dlls/gphoto2.ds/gphoto2_Ro.rc @@ -0,0 +1,57 @@ +/* + * Copyright 2006 CodeWeavers, Aric Stewart + * Copyright 2010 Claudia Cotună + * Michael Stefaniuc + * + * 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" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 +STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +CAPTION "Fișiere în aparatul foto" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "Lista1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | +WS_TABSTOP,7,7,358,229 + DEFPUSHBUTTON "Importă selecția",IDC_IMPORT,152,252,72,14 + PUSHBUTTON "Previzualizare",IDC_FETCH,7,252,64,14 + PUSHBUTTON "Importă tot",IDC_IMPORTALL,80,252,64,14 + CONTROL "Omite acest dialog",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + PUSHBUTTON "Ieșire",IDC_EXIT,315,252,50,14 +END + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Transferare" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Se transferă... Așteptați",IDC_STATIC,5,19,176,8, SS_CENTER +END + +IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER +CAPTION "Conectare la cameră" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "Se conectează la cameră... Așteptați",IDC_STATIC,128,58,116,8 +END

1 0

Michael Stefaniuc : msvfw32: Add the Romanian translation.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: d22e3e4324af139c5da9c082a16223c0a444ef58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d22e3e4324af139c5da9c082a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 23 13:09:54 2010 +0200 msvfw32: Add the Romanian translation. Translation by Claudia Cotună. --- dlls/msvfw32/Makefile.in | 1 + dlls/msvfw32/msvfw32_Ro.rc | 57 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in index 292e345..e431ce5 100644 --- a/dlls/msvfw32/Makefile.in +++ b/dlls/msvfw32/Makefile.in @@ -25,6 +25,7 @@ RC_SRCS = \ msvfw32_No.rc \ msvfw32_Pl.rc \ msvfw32_Pt.rc \ + msvfw32_Ro.rc \ msvfw32_Ru.rc \ msvfw32_Si.rc \ msvfw32_Sv.rc \ diff --git a/dlls/msvfw32/msvfw32_Ro.rc b/dlls/msvfw32/msvfw32_Ro.rc new file mode 100644 index 0000000..69527b0 --- /dev/null +++ b/dlls/msvfw32/msvfw32_Ro.rc @@ -0,0 +1,57 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2010 Claudia Cotună + * Michael Stefaniuc + * + * 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 "msvideo_private.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 200, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Compresie video" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK",IDOK,140,2,51,14 + PUSHBUTTON "Renunță",IDCANCEL,140,18,51,14 + + LTEXT "&Compresor:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "Con&figurare...",882,140,36,51,14 + PUSHBUTTON "&Despre...",883,140,52,51,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "Ca&litatea compresiei:",886,9,34,80,8 + + CONTROL "Cadru c&heie la fiecare",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,82,12 + EDITTEXT 888,93,60,22,12 + LTEXT "cadre",889,118,62,22,10 + + CONTROL "Rata de &date",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,70,12 + EDITTEXT 895,93,76,22,12 + LTEXT "KO/sec",896,118,78,22,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Cadre întregi (necomprimate)" +}

1 0