July 2009 - Wine-Commits - list.winehq.org

Paul Vriens : comdlg32: Fixed size of Dutch control.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 8ce06b14848905c3a32925938dacf8495e4917a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ce06b14848905c3a32925938… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Jul 5 13:41:20 2009 +0200 comdlg32: Fixed size of Dutch control. --- dlls/comdlg32/cdlg_Nl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/cdlg_Nl.rc b/dlls/comdlg32/cdlg_Nl.rc index 8c2c5dd..340c2db 100644 --- a/dlls/comdlg32/cdlg_Nl.rc +++ b/dlls/comdlg32/cdlg_Nl.rc @@ -240,7 +240,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Bestands&typen:",IDC_FILETYPESTATIC,5,128,48,8, SS_NOTIFY COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Openen met als kenmerk &Alleen-lezen",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 + CONTROL "Openen met als kenmerk &Alleen-lezen",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,140,10 DEFPUSHBUTTON "&Openen", IDOK,222,110,50,14 PUSHBUTTON "Annuleren", IDCANCEL,222,128,50,14

1 0

Alexander Nicolaysen Sørnes : reg: Update Norwegian Bokmål translation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 815a66d787277d48c96edfb395566a39ec48e4c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=815a66d787277d48c96edfb39… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.site> Date: Sat Jul 4 00:36:58 2009 +0200 reg: Update Norwegian Bokmål translation. --- programs/reg/No.rc | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/programs/reg/No.rc b/programs/reg/No.rc index 5ad032d..cc43c39 100644 --- a/programs/reg/No.rc +++ b/programs/reg/No.rc @@ -1,8 +1,8 @@ /* * REG.EXE - Wine-compatible reg program. - * Norwegian (Bokm�l) language support + * Norwegian (Bokmål) language support * - * Copyright 2008 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2008-2009 Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,12 +21,19 @@ #include "reg.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE { - STRING_USAGE, "Programmer kj�res som f�lger:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n" - STRING_ADD_USAGE, "REG ADD n�kkelnavn [/v verdi | /ve] [/t type] [/s separator] [/d data] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE n�kkelnavn [/v verdi | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY n�kkelnavn [/v verdi | /ve] [/s]\n" + STRING_USAGE, "Programmer kjøres som følger:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n" + STRING_ADD_USAGE, "REG ADD nøkkelnavn [/v verdi | /ve] [/t type] [/s separator] [/d data] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE nøkkelnavn [/v verdi | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY nøkkelnavn [/v verdi | /ve] [/s]\n" + STRING_SUCCESS, "Operasjonen ble utført\n" + STRING_INVALID_KEY, "Feil: Ugyldig nøkkelnavn\n" + STRING_INVALID_CMDLINE, "Feil: Ugyldige parametere på kommandolinjen\n" + STRING_NO_REMOTE, "Feil: Kan ikke legge til nøkler på ekstern maskin\n" + STRING_CANNOT_FIND, "Feil: Systemet klarte ikke finne den angitte registernøkkelen eller -verdien\n" }

1 0

Aurimas Fišeras : crypt32: Add "Disallowed" to CryptFindLocalizedName.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 958899393d19a69bcba9e5c4fcaf2ddd805f974d URL: http://source.winehq.org/git/wine.git/?a=commit;h=958899393d19a69bcba9e5c4f… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jul 5 13:52:35 2009 +0300 crypt32: Add "Disallowed" to CryptFindLocalizedName. --- dlls/crypt32/crypt32_En.rc | 1 + dlls/crypt32/cryptres.h | 1 + dlls/crypt32/oid.c | 3 ++- 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32_En.rc b/dlls/crypt32/crypt32_En.rc index 4670029..92d26c5 100644 --- a/dlls/crypt32/crypt32_En.rc +++ b/dlls/crypt32/crypt32_En.rc @@ -174,6 +174,7 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_CA "Intermediate Certification Authorities" IDS_LOCALIZEDNAME_ADDRESSBOOK "Other People" IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Trusted Publishers" + IDS_LOCALIZEDNAME_DISALLOWED "Disallowed" } STRINGTABLE DISCARDABLE diff --git a/dlls/crypt32/cryptres.h b/dlls/crypt32/cryptres.h index f9845be..0bbffcc 100644 --- a/dlls/crypt32/cryptres.h +++ b/dlls/crypt32/cryptres.h @@ -167,6 +167,7 @@ #define IDS_LOCALIZEDNAME_CA 1143 #define IDS_LOCALIZEDNAME_ADDRESSBOOK 1144 #define IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER 1145 +#define IDS_LOCALIZEDNAME_DISALLOWED 1146 #define IDS_KEY_ID 1200 #define IDS_CERT_ISSUER 1201 diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index f0ea8ea..ddc6efc 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -82,7 +82,8 @@ static const WCHAR MY[] = {'M','Y',0}; static const WCHAR CA[] = {'C','A',0}; static const WCHAR ADDRESSBOOK[] = {'A','D','D','R','E','S','S','B','O','O','K',0}; static const WCHAR TRUSTEDPUBLISHER[] = {'T','r','u','s','t','e','d','P','u','b','l','i','s','h','e','r',0}; -static const LPCWSTR LocalizedKeys[] = {ROOT,MY,CA,ADDRESSBOOK,TRUSTEDPUBLISHER}; +static const WCHAR DISALLOWED[] = {'D','i','s','a','l','l','o','w','e','d',0}; +static const LPCWSTR LocalizedKeys[] = {ROOT,MY,CA,ADDRESSBOOK,TRUSTEDPUBLISHER,DISALLOWED}; static WCHAR LocalizedNames[sizeof(LocalizedKeys)/sizeof(LocalizedKeys[0])][256]; static void free_function_sets(void)

1 0

Aurimas Fišeras : Various spelling fixes for Lithuanian translation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 4e1af57b5f5efa0421bdc11cc272890fe2f06eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e1af57b5f5efa0421bdc11cc… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jul 5 16:00:24 2009 +0300 Various spelling fixes for Lithuanian translation. --- dlls/comdlg32/cdlg_Lt.rc | 2 +- dlls/shdoclc/Lt.rc | 2 +- dlls/winspool.drv/Lt.rc | 2 +- programs/oleview/Lt.rc | 10 +++++----- programs/regedit/Lt.rc | 4 ++-- programs/winecfg/Lt.rc | 4 ++-- programs/wineconsole/wineconsole_Lt.rc | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/comdlg32/cdlg_Lt.rc b/dlls/comdlg32/cdlg_Lt.rc index 53463bc..c4bbf98 100644 --- a/dlls/comdlg32/cdlg_Lt.rc +++ b/dlls/comdlg32/cdlg_Lt.rc @@ -411,7 +411,7 @@ STRINGTABLE DISCARDABLE PD32_DRIVER_UNKNOWN "Nežinoma spausdintuvo tvarkyklė." PD32_NO_DEVICES "Prieš atlikdami su spausdintuvu susijusius veiksmus, \ tokius kaip puslapio nuostatų keitimas ar dokumento spausdinimas, turite įdiegti spausdintuvą. \ -Prašome įdeigti spausdintuvą ir pakartoti." +Prašome įdiegti spausdintuvą ir pakartoti." PD32_DEFAULT_PRINTER "Pagrindinis spausdintuvas; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Eilėje yra %d dokumentų" diff --git a/dlls/shdoclc/Lt.rc b/dlls/shdoclc/Lt.rc index 331e0a9..e6c812d 100644 --- a/dlls/shdoclc/Lt.rc +++ b/dlls/shdoclc/Lt.rc @@ -71,7 +71,7 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR MENUITEM "Rod&yti paveikslą", IDM_SHOWPICTURE MENUITEM "Įrašyti pa&veikslą kaip...", IDM_SAVEPICTURE - MENUITEM "Išsiųsti pev&eikslą el. paštu...", IDM_MP_EMAILPICTURE + MENUITEM "Išsiųsti pav&eikslą el. paštu...", IDM_MP_EMAILPICTURE MENUITEM "S&pausdinti paveikslą...", IDM_MP_PRINTPICTURE MENUITEM "Ei&ti į paveikslų aplanką", IDM_MP_MYPICS MENUITEM "Parinkti užsk&landos piešiniu", IDM_SETWALLPAPER diff --git a/dlls/winspool.drv/Lt.rc b/dlls/winspool.drv/Lt.rc index 46761e8..1c5b1e8 100644 --- a/dlls/winspool.drv/Lt.rc +++ b/dlls/winspool.drv/Lt.rc @@ -39,6 +39,6 @@ END STRINGTABLE DISCARDABLE { IDS_CAPTION "Lokalus prievadas" - IDS_FILE_EXISTS "Išvesties failas jau egzistouja. Norėdami failą keisti spauskite Gerai." + IDS_FILE_EXISTS "Išvesties failas jau egzistuoja. Norėdami failą keisti spauskite Gerai." IDS_CANNOT_OPEN "Nepavyko sukurti išvesties failo." } diff --git a/programs/oleview/Lt.rc b/programs/oleview/Lt.rc index a5d131c..df8dee0 100644 --- a/programs/oleview/Lt.rc +++ b/programs/oleview/Lt.rc @@ -1,5 +1,5 @@ /* - * OLE žiuryklė + * OLE žiūryklė * Lithuanian Language Support * * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> @@ -72,7 +72,7 @@ IDM_MENU MENU } POPUP "&Žinynas" { - MENUITEM "&Apie OLE žiurykę", IDM_ABOUT + MENUITEM "&Apie OLE žiūrykę", IDM_ABOUT } } @@ -94,10 +94,10 @@ IDM_TYPELIB MENU STRINGTABLE { - IDS_APPNAME "OLE žiuryklė" - IDS_APPTITLE "OLE žiuryklė" + IDS_APPNAME "OLE žiūryklė" + IDS_APPTITLE "OLE žiūryklė" IDS_READY "Parengta" - IDS_ABOUT "OLE žiuryklė - OLE/COM objektų žiūryklė" + IDS_ABOUT "OLE žiūryklė - OLE/COM objektų žiūryklė" IDS_ABOUTVER "versija 1.0" IDS_TYPELIBTITLE "ITypeLib žiūryklė" IDS_OPEN "Atverti" diff --git a/programs/regedit/Lt.rc b/programs/regedit/Lt.rc index 21109fa..79a577d 100644 --- a/programs/regedit/Lt.rc +++ b/programs/regedit/Lt.rc @@ -258,7 +258,7 @@ BEGIN ID_EDIT_MODIFY "Modifikuoja reikšmės duomenis" ID_EDIT_NEW_KEY "Prideda naują raktą" ID_EDIT_NEW_STRINGVALUE "Prideda naują eilutės reikšmę" - ID_EDIT_NEW_BINARYVALUE "Prideda naują dvejeteinę reikšmę" + ID_EDIT_NEW_BINARYVALUE "Prideda naują dvejetainę reikšmę" ID_EDIT_NEW_DWORDVALUE "Prideda naują dvigubojo žodžio reikšmę" ID_EDIT_NEW_MULTI_STRINGVALUE "Prideda naują kelių eilučių reikšmę" ID_REGISTRY_IMPORTREGISTRYFILE "Importuoja tekstinį failą į registrą" @@ -277,7 +277,7 @@ BEGIN ID_REGISTRY_EXIT "Išeina iš registro tvarkytuvės" ID_FAVORITES_ADDTOFAVORITES "Prideda pasirinktą raktą į adresyną" ID_FAVORITES_REMOVEFAVORITE "Pašalina nurodytus raktus iš adresyno" - ID_VIEW_STATUSBAR "Parodo arba paslėpia būsenos juostą" + ID_VIEW_STATUSBAR "Parodo arba paslepia būsenos juostą" ID_VIEW_SPLIT "Pakeičia polangių skirtuko poziciją tarp polangių" ID_VIEW_REFRESH "Atnaujina langą" ID_EDIT_DELETE "Šalina atranką" diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc index 296390b..e31c2cb 100644 --- a/programs/winecfg/Lt.rc +++ b/programs/winecfg/Lt.rc @@ -111,7 +111,7 @@ END IDD_LOADORDER DIALOG DISCARDABLE 80, 90, 110, 92 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Edit Override" +CAPTION "Redaguoti nustelbimą" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Įkėlimo tvarka ",IDC_STATIC,8,4,94,66 @@ -243,7 +243,7 @@ BEGIN IDS_DEFAULT_SETTINGS "Numatytosios nuostatos" IDS_EXECUTABLE_FILTER "Wine programos (*.exe,*.exe.so)\0*.exe;*.exe.so\0" IDS_USE_GLOBAL_SETTINGS "Naudoti globalias nuostatas" - IDS_SELECT_EXECUTABLE "Pasirikite vykdomąjį failą" + IDS_SELECT_EXECUTABLE "Pasirinkite vykdomąjį failą" END STRINGTABLE DISCARDABLE diff --git a/programs/wineconsole/wineconsole_Lt.rc b/programs/wineconsole/wineconsole_Lt.rc index 2e05466..311bb1f 100644 --- a/programs/wineconsole/wineconsole_Lt.rc +++ b/programs/wineconsole/wineconsole_Lt.rc @@ -26,7 +26,7 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_EDIT, "&Taisa" -IDS_DEFAULT, "Nustatyti &numatytasias" +IDS_DEFAULT, "Nustatyti &numatytąsias" IDS_PROPERTIES, "&Savybės" IDS_MARK, "&Žymėti" IDS_COPY, "&Kopijuoti"

1 0

Paul Vriens : gdi32/tests: Mark an intermittent failure as broken() on Win9x/ME.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 31d82c5fdc2b68c10db96f8d1712a93a6fa55037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d82c5fdc2b68c10db96f8d1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Jul 4 16:27:02 2009 +0200 gdi32/tests: Mark an intermittent failure as broken() on Win9x/ME. --- dlls/gdi32/tests/bitmap.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index a0e767d..660a145 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -780,7 +780,9 @@ static void test_dibsections(void) BitBlt(hdcmem2, 0, 0, 16,16, hdcmem, 0, 0, SRCCOPY); ok(bits32[0] == 0xff00, "lower left pixel is %08x\n", bits32[0]); - ok(bits32[17] == 0xff00ff, "bottom but one, left pixel is %08x\n", bits32[17]); + ok(bits32[17] == 0xff00ff || + broken(bits32[17] == 0x00ff00), /* Intermittent on Win9x/ME */ + "bottom but one, left pixel is %08x\n", bits32[17]); SelectObject(hdcmem2, oldbm2); test_dib_info(hdib2, bits32, &pbmi->bmiHeader);

1 0

Damjan Jovanovic : ws2_32: Add some AcceptEx tests.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 71f7da2d3eca1374a7bc864424ee5ea2b576f2bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=71f7da2d3eca1374a7bc86442… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Jul 5 12:39:58 2009 +0200 ws2_32: Add some AcceptEx tests. --- dlls/ws2_32/tests/sock.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 130 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c90f391..1eab132 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2539,6 +2539,134 @@ static void test_GetAddrInfoW(void) pFreeAddrInfoW(result); } +static void test_AcceptEx(void) +{ + SOCKET listener = INVALID_SOCKET; + SOCKET acceptor = INVALID_SOCKET; + SOCKET connector = INVALID_SOCKET; + struct sockaddr_in bindAddress; + int socklen; + GUID acceptExGuid = WSAID_ACCEPTEX; + BOOL WINAPI (*pAcceptEx)(SOCKET listener, SOCKET acceptor, PVOID dest, DWORD dest_len, + DWORD local_addr_len, DWORD rem_addr_len, LPDWORD received, + LPOVERLAPPED overlapped); + DWORD bytesReturned; + char buffer[1024]; + OVERLAPPED overlapped; + int iret; + BOOL bret; + DWORD dwret; + + memset(&overlapped, 0, sizeof(overlapped)); + + listener = socket(AF_INET, SOCK_STREAM, 0); + if (listener == INVALID_SOCKET) { + skip("could not create listener socket, error %d\n", WSAGetLastError()); + goto end; + } + + acceptor = socket(AF_INET, SOCK_STREAM, 0); + if (acceptor == INVALID_SOCKET) { + skip("could not create acceptor socket, error %d\n", WSAGetLastError()); + goto end; + } + + connector = socket(AF_INET, SOCK_STREAM, 0); + if (connector == INVALID_SOCKET) { + skip("could not create connector socket, error %d\n", WSAGetLastError()); + goto end; + } + + memset(&bindAddress, 0, sizeof(bindAddress)); + bindAddress.sin_family = AF_INET; + bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1"); + iret = bind(listener, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + if (iret != 0) { + skip("failed to bind, error %d\n", WSAGetLastError()); + goto end; + } + + socklen = sizeof(bindAddress); + iret = getsockname(listener, (struct sockaddr*)&bindAddress, &socklen); + if (iret != 0) { + skip("failed to lookup bind address, error %d\n", WSAGetLastError()); + goto end; + } + + if (set_blocking(listener, FALSE)) { + skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); + goto end; + } + + iret = WSAIoctl(listener, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptExGuid, sizeof(acceptExGuid), + &pAcceptEx, sizeof(pAcceptEx), &bytesReturned, NULL, NULL); + if (iret) { + skip("WSAIoctl failed to get AcceptEx with ret %d + errno %d\n", iret, WSAGetLastError()); + goto end; + } + + bret = pAcceptEx(INVALID_SOCKET, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "AcceptEx on invalid listening socket " + "returned %d + errno %d\n", bret, WSAGetLastError()); + + bret = pAcceptEx(listener, INVALID_SOCKET, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on invalid accepting socket " + "returned %d + errno %d\n", bret, WSAGetLastError()); + + bret = pAcceptEx(listener, acceptor, NULL, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on NULL buffer " + "returned %d + errno %d\n", bret, WSAGetLastError()); + + bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on a non-listening socket " + "returned %d + errno %d\n", bret, WSAGetLastError()); + + iret = listen(listener, 5); + if (iret != 0) { + skip("listening failed, errno = %d\n", WSAGetLastError()); + goto end; + } + + overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + if (overlapped.hEvent == NULL) { + skip("could not create event object, errno = %d\n", GetLastError()); + goto end; + } + + bret = pAcceptEx(listener, acceptor, buffer, 0, + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + + iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); + + dwret = WaitForSingleObject(overlapped.hEvent, INFINITE); + ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); + + bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); + ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); + ok(bytesReturned == 0, "bytesReturned isn't supposed to be %d\n", bytesReturned); + +end: + if (overlapped.hEvent) + WSACloseEvent(overlapped.hEvent); + if (listener != INVALID_SOCKET) + closesocket(listener); + if (acceptor != INVALID_SOCKET) + closesocket(acceptor); + if (connector != INVALID_SOCKET) + closesocket(connector); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -2591,5 +2719,7 @@ START_TEST( sock ) test_ipv6only(); test_GetAddrInfoW(); + test_AcceptEx(); + Exit(); }

1 0

Alexander Nicolaysen Sørnes : notepad: Update Norwegian Bokmål translation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 18045e5681396d9d4aa94849a48d607aea37582c URL: http://source.winehq.org/git/wine.git/?a=commit;h=18045e5681396d9d4aa94849a… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.site> Date: Sat Jul 4 00:56:19 2009 +0200 notepad: Update Norwegian Bokmål translation. --- programs/notepad/No.rc | 50 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 35 insertions(+), 15 deletions(-) diff --git a/programs/notepad/No.rc b/programs/notepad/No.rc index fe3f19e..512fa2d 100644 --- a/programs/notepad/No.rc +++ b/programs/notepad/No.rc @@ -1,7 +1,7 @@ /* - * Notepad (Norwegian Bokm�l resources) + * Notepad (Norwegian Bokmål resources) * - * Copyright 2005-2006 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2006 Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,13 +20,15 @@ #include "notepad_res.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL MAIN_MENU MENU { POPUP "&Fil" { MENUITEM "&Ny\tCtrl+N", CMD_NEW - MENUITEM "&�pne...\tCtrl+O", CMD_OPEN + MENUITEM "&Åpne...\tCtrl+O", CMD_OPEN MENUITEM "&Lagre\tCtrl+S", CMD_SAVE MENUITEM "Lagr&e som...", CMD_SAVE_AS MENUITEM SEPARATOR @@ -50,13 +52,14 @@ POPUP "R&ediger" { MENUITEM "Tekstbrytin&g", CMD_WRAP MENUITEM "Skr&ift...", CMD_FONT } -POPUP "&S�k" { - MENUITEM "&S�k...\tCtrl+F", CMD_SEARCH - MENUITEM "&S�k etter nest&e\tF3", CMD_SEARCH_NEXT +POPUP "&Søk" { + MENUITEM "&Søk...\tCtrl+F", CMD_SEARCH + MENUITEM "Søk etter nest&e\tF3", CMD_SEARCH_NEXT + MENUITEM "E&rstatt...\tCtrl+H", CMD_REPLACE } POPUP "&Hjelp" { MENUITEM "&Innhold", CMD_HELP_CONTENTS - MENUITEM "&S�k...", CMD_HELP_SEARCH + MENUITEM "&Søk...", CMD_HELP_SEARCH MENUITEM "&Hjelp om hjelp", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&Om Notepad", CMD_HELP_ABOUT_NOTEPAD @@ -80,7 +83,7 @@ LTEXT "&Venstre:", 0x145, 20, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP LTEXT "&Topp:", 0x148, 20, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "H�y&re:", 0x14B, 100, 55, 30, 10, WS_CHILD +LTEXT "Høy&re:", 0x14B, 100, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_RIGHTVALUE, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP LTEXT "&Bunn:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP @@ -90,6 +93,14 @@ PUSHBUTTON "Avbryt", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP PUSHBUTTON "&Hjelp", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Tegnkoding:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" @@ -105,17 +116,26 @@ STRING_UNTITLED, "(Uten navn)" STRING_ALL_FILES, "Alle filer (*.*)" STRING_TEXT_FILES_TXT, "Tekstfiler (*.txt)" -STRING_TOOLARGE, "Filen �%s� er for stor for Notisblokk.\n \ +STRING_TOOLARGE, "Filen «%s» er for stor for Notisblokk.\n \ Bruk en annen redigerer." STRING_NOTEXT, "Du skrev ikke inn noe tekst. \ -\nSkriv noe og pr�v igjen." -STRING_DOESNOTEXIST, "Filen �%s� finnes ikke.\n\n \ +\nSkriv noe og prøv igjen." +STRING_DOESNOTEXIST, "Filen «%s» finnes ikke.\n\n \ Opprette en ny fil?" -STRING_NOTSAVED, "Filen �%s� er endret.\n\n \ +STRING_NOTSAVED, "Filen «%s» er endret.\n\n \ Lagre endringene?" -STRING_NOTFOUND, "Klarte ikke finne �%s�." -STRING_OUT_OF_MEMORY, "Ikke nok minne for � fullf�re \ -operasjonen.\nLukk et eller flere programmer for � frigj�re\nmer \ +STRING_NOTFOUND, "Klarte ikke finne «%s»." +STRING_OUT_OF_MEMORY, "Ikke nok minne for å fullføre \ +operasjonen.\nLukk et eller flere programmer for å frigjøre\nmer \ minne." +STRING_UNICODE_LE, "Unicode (UTF-16)" +STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "«%s»\n\ +Denne filen inneholder Unicode-tegn som vil gå tapt hvis \n\ +filen lagres med tegnkodingen %s. \n\ +Trykk Avbryt og velg et av Unicode-valgene fra listen \n\ +hvis du vil beholde tegnene. \n\ +Fortsette?" }

1 0

Paul Vriens : d3d9/tests: Skip a test on failure.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: f96e210ed7089f83601acba5d2e8a242aa1a8195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f96e210ed7089f83601acba5d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Jul 4 16:56:10 2009 +0200 d3d9/tests: Skip a test on failure. --- dlls/d3d9/tests/device.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 66f53b9..f56e05e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2336,10 +2336,12 @@ static void test_multi_device(void) hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd1, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device1); - ok(SUCCEEDED(hr), "Failed to create a device, hr %#x\n", hr); IDirect3D9_Release(d3d9); d3d9 = NULL; - if (FAILED(hr)) goto fail; + if (FAILED(hr)) { + skip("Failed to create a device\n"); + goto fail; + } d3d9 = pDirect3DCreate9(D3D_SDK_VERSION); ok(d3d9 != NULL, "Failed to create a d3d9 object.\n");

1 0

Paul Vriens : ole32/tests: Reset a variable before testing.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: f057d7d63f0b47854c533be0949ad452d7db39d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f057d7d63f0b47854c533be09… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Jul 4 17:35:01 2009 +0200 ole32/tests: Reset a variable before testing. --- dlls/ole32/tests/moniker.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 5d3f6f5..306a892 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1143,7 +1143,7 @@ static void test_moniker( LPBYTE moniker_data; DWORD moniker_size; DWORD i; - BOOL same = TRUE; + BOOL same; BYTE buffer[128]; IMoniker * moniker_proxy; LPOLESTR display_name; @@ -1183,6 +1183,7 @@ static void test_moniker( testname, sizeof_expected_moniker_comparison_data, moniker_size); /* then do a byte-by-byte comparison */ + same = TRUE; for (i = 0; i < min(moniker_size, sizeof_expected_moniker_comparison_data); i++) { if (expected_moniker_comparison_data[i] != buffer[i]) @@ -1226,6 +1227,7 @@ static void test_moniker( testname, (DWORD)round_global_size(sizeof_expected_moniker_saved_data), moniker_size); /* then do a byte-by-byte comparison */ + same = TRUE; for (i = 0; i < min(moniker_size, round_global_size(sizeof_expected_moniker_saved_data)); i++) { if (expected_moniker_saved_data[i] != moniker_data[i]) @@ -1272,6 +1274,7 @@ static void test_moniker( testname, (DWORD)round_global_size(sizeof_expected_moniker_marshal_data), moniker_size); /* then do a byte-by-byte comparison */ + same = TRUE; if (expected_moniker_marshal_data) { for (i = 0; i < min(moniker_size, round_global_size(sizeof_expected_moniker_marshal_data)); i++)

1 0

Frédéric Delanoy : regedit: Fix French translation & UI display.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: e2f26883561466e9b7f39f3cca7b3016833ae699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f26883561466e9b7f39f3cc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 4 19:32:33 2009 +0200 regedit: Fix French translation & UI display. --- programs/regedit/Fr.rc | 207 ++++++++++++++++++++++++------------------------ 1 files changed, 105 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2f26883561466e9b7f39…

1 0

Frédéric Delanoy : oleview: Fix French translation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: d4bba24e5c487c977f8fec468eb253a9a3338ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4bba24e5c487c977f8fec468… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 4 17:31:28 2009 +0200 oleview: Fix French translation. --- programs/oleview/Fr.rc | 129 ++++++++++++++++++++++++----------------------- 1 files changed, 66 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4bba24e5c487c977f8fe…

1 0

Frédéric Delanoy : uninstaller: Fix French translation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 1cbb7e1cae65f6fdd667ac60b435ee0c87c0ddae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cbb7e1cae65f6fdd667ac60b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 5 01:09:08 2009 +0200 uninstaller: Fix French translation. --- programs/uninstaller/Fr.rc | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/uninstaller/Fr.rc b/programs/uninstaller/Fr.rc index d1a4485..5e0d0f1 100644 --- a/programs/uninstaller/Fr.rc +++ b/programs/uninstaller/Fr.rc @@ -20,9 +20,15 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + STRINGTABLE DISCARDABLE { - IDS_APPNAME, "D�sinstalleur d'applications de Wine" - IDS_UNINSTALLFAILED, "Erreur lors de l'excution de la commande de d�sinstallation � %s �. L'ex�cutable ne peut peut �tre pas �tre trouv�.\r\nSouhaitez-vous supprimmer l'entr�e de la base de registre ?" + IDS_APPNAME, "Désinstalleur d'applications de Wine" + IDS_UNINSTALLFAILED, "Erreur lors de l'excution de la commande de \ +désinstallation « %s ». L'exécutable n'a peut-être pas été trouvé.\ +\nSouhaitez-vous supprimmer l'entrée de la base de registre ?" }

1 0

Frédéric Delanoy : taskmgr: Update French translation; display fixes.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: afcbfa4ac2dba8a161c851a3dc3e030c08c4d347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afcbfa4ac2dba8a161c851a3d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 5 00:39:02 2009 +0200 taskmgr: Update French translation; display fixes. --- programs/taskmgr/Fr.rc | 360 ++++++++++++++++++++++++++++++------------------ 1 files changed, 225 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afcbfa4ac2dba8a161c85…

1 0

Frédéric Delanoy : oleacc: Update French translation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 2de12c654192a7bf0067f8cd1911cdc73e656dd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de12c654192a7bf0067f8cd1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 3 16:54:38 2009 +0200 oleacc: Update French translation. --- dlls/oleacc/oleacc_Fr.rc | 52 ++++++++++++++++++++++++--------------------- 1 files changed, 28 insertions(+), 24 deletions(-) diff --git a/dlls/oleacc/oleacc_Fr.rc b/dlls/oleacc/oleacc_Fr.rc index fbdfa05..8eabc3c 100644 --- a/dlls/oleacc/oleacc_Fr.rc +++ b/dlls/oleacc/oleacc_Fr.rc @@ -2,6 +2,7 @@ * French resources for oleacc * * Copyright 2008 Jonathan Ernst + * Copyright 2009 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,32 +21,35 @@ #include "oleacc.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - 0 "objet inconnu" /* undocumented */ + 0 "objet inconnu" /* non documenté */ ROLE_SYSTEM_TITLEBAR "barre de titre" - ROLE_SYSTEM_MENUBAR "barre de menu" + ROLE_SYSTEM_MENUBAR "barre de menus" ROLE_SYSTEM_SCROLLBAR "barre de défilement" - ROLE_SYSTEM_GRIP "grip" + ROLE_SYSTEM_GRIP "poignée" ROLE_SYSTEM_SOUND "son" ROLE_SYSTEM_CURSOR "curseur" - ROLE_SYSTEM_CARET "caret" + ROLE_SYSTEM_CARET "curseur texte" ROLE_SYSTEM_ALERT "alerte" ROLE_SYSTEM_WINDOW "fenêtre" ROLE_SYSTEM_CLIENT "client" - ROLE_SYSTEM_MENUPOPUP "menu popup" + ROLE_SYSTEM_MENUPOPUP "menu contextuel" ROLE_SYSTEM_MENUITEM "élément de menu" ROLE_SYSTEM_TOOLTIP "infobulle" ROLE_SYSTEM_APPLICATION "application" ROLE_SYSTEM_DOCUMENT "document" - ROLE_SYSTEM_PANE "pane" - ROLE_SYSTEM_CHART "chart" + ROLE_SYSTEM_PANE "panneau" + ROLE_SYSTEM_CHART "diagramme" ROLE_SYSTEM_DIALOG "boîte de dialogue" ROLE_SYSTEM_BORDER "bordure" - ROLE_SYSTEM_GROUPING "grouping" - ROLE_SYSTEM_SEPARATOR "separateur" + ROLE_SYSTEM_GROUPING "groupement" + ROLE_SYSTEM_SEPARATOR "séparateur" ROLE_SYSTEM_TOOLBAR "barre d'outils" ROLE_SYSTEM_STATUSBAR "barre d'état" ROLE_SYSTEM_TABLE "table" @@ -59,8 +63,8 @@ STRINGTABLE DISCARDABLE ROLE_SYSTEM_CHARACTER "caractère" ROLE_SYSTEM_LIST "liste" ROLE_SYSTEM_LISTITEM "élément de liste" - ROLE_SYSTEM_OUTLINE "outline" - ROLE_SYSTEM_OUTLINEITEM "outline item" + ROLE_SYSTEM_OUTLINE "plan" + ROLE_SYSTEM_OUTLINEITEM "élément du plan" ROLE_SYSTEM_PAGETAB "onglet de page" ROLE_SYSTEM_PROPERTYPAGE "page de propriétés" ROLE_SYSTEM_INDICATOR "indicateur" @@ -70,23 +74,23 @@ STRINGTABLE DISCARDABLE ROLE_SYSTEM_PUSHBUTTON "bouton pressoir" ROLE_SYSTEM_CHECKBUTTON "case à cocher" ROLE_SYSTEM_RADIOBUTTON "bouton radio" - ROLE_SYSTEM_COMBOBOX "combo box" - ROLE_SYSTEM_DROPLIST "drop down" + ROLE_SYSTEM_COMBOBOX "boîte combinée" + ROLE_SYSTEM_DROPLIST "liste déroulante" ROLE_SYSTEM_PROGRESSBAR "barre de progression" - ROLE_SYSTEM_DIAL "dial" - ROLE_SYSTEM_HOTKEYFIELD "hot key field" - ROLE_SYSTEM_SLIDER "slider" - ROLE_SYSTEM_SPINBUTTON "spin box" + ROLE_SYSTEM_DIAL "cadran" + ROLE_SYSTEM_HOTKEYFIELD "champ avec raccourci clavier" + ROLE_SYSTEM_SLIDER "glissière" + ROLE_SYSTEM_SPINBUTTON "bouton fléché" ROLE_SYSTEM_DIAGRAM "diagramme" ROLE_SYSTEM_ANIMATION "animation" ROLE_SYSTEM_EQUATION "équation" - ROLE_SYSTEM_BUTTONDROPDOWN "drop down button" + ROLE_SYSTEM_BUTTONDROPDOWN "bouton avec liste déroulante" ROLE_SYSTEM_BUTTONMENU "bouton de menu" - ROLE_SYSTEM_BUTTONDROPDOWNGRID "grid drop down button" - ROLE_SYSTEM_WHITESPACE "espace blanc" - ROLE_SYSTEM_PAGETABLIST "page tab list" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "bouton avec grille déroulante" + ROLE_SYSTEM_WHITESPACE "blanc" + ROLE_SYSTEM_PAGETABLIST "liste d'onglets de pages" ROLE_SYSTEM_CLOCK "horloge" - ROLE_SYSTEM_SPLITBUTTON "split button" - ROLE_SYSTEM_IPADDRESS "Adresse IP" - ROLE_SYSTEM_OUTLINEBUTTON "outline button" + ROLE_SYSTEM_SPLITBUTTON "bouton avec menu" + ROLE_SYSTEM_IPADDRESS "adresse IP" + ROLE_SYSTEM_OUTLINEBUTTON "bouton de résumé" }

1 0

Frédéric Delanoy : user32: Update French translation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 5e36ced1396763d93105abd5c202d43941c3ecac URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e36ced1396763d93105abd5c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 3 19:04:28 2009 +0200 user32: Update French translation. --- dlls/user32/resources/user32_Fr.rc | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/user32/resources/user32_Fr.rc b/dlls/user32/resources/user32_Fr.rc index b95c9cd..18d9039 100644 --- a/dlls/user32/resources/user32_Fr.rc +++ b/dlls/user32/resources/user32_Fr.rc @@ -1,5 +1,5 @@ /* - * User + * User32 * French language support * * Copyright 1995 Alexandre Julliard @@ -21,19 +21,22 @@ #include "resources.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE { MENUITEM "&Restauration", 61728 - MENUITEM "&D�placement", 61456 + MENUITEM "&Déplacement", 61456 MENUITEM "Di&mension", 61440 - MENUITEM "R�duct&ion", 61472 + MENUITEM "Réduct&ion", 61472 MENUITEM "&Agrandissement", 61488 MENUITEM SEPARATOR MENUITEM "&Fermeture\tAlt-F4", 61536 MENUITEM SEPARATOR - MENUITEM "� propos de &Wine...", 61761 + MENUITEM "À propos de &Wine...", 61761 } EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE @@ -42,12 +45,12 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE BEGIN MENUITEM "&Annuler", EM_UNDO MENUITEM SEPARATOR - MENUITEM "Coupe&r", WM_CUT - MENUITEM "&Copier", WM_COPY + MENUITEM "&Couper", WM_CUT + MENUITEM "Co&pier", WM_COPY MENUITEM "C&oller", WM_PASTE MENUITEM "E&ffacer", WM_CLEAR MENUITEM SEPARATOR - MENUITEM "Tout &s�lectionner", EM_SETSEL + MENUITEM "&Tout sélectionner", EM_SETSEL END } @@ -58,19 +61,19 @@ BEGIN LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX PUSHBUTTON "&Ok", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Annuler", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Annuler", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&R�p�ter", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "A&bandonner", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Ré&péter", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Ignorer", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Oui", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Non", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Try Again", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Continue", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Réessayer", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Continuer", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Aide", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "S�lection de fen�tre" +CAPTION "Sélection de fenêtre" FONT 8, "MS Shell Dlg" BEGIN LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */ @@ -82,5 +85,5 @@ END STRINGTABLE DISCARDABLE { IDS_ERROR "Erreur" - IDS_MDI_MOREWINDOWS "&Plus de fen�tres..." + IDS_MDI_MOREWINDOWS "&Plus de fenêtres..." }

1 0

Frédéric Delanoy : winmm: Fix French translation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: da81ee2520b996e99b0b1f27c7b9931cb4985c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da81ee2520b996e99b0b1f27c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 3 19:33:15 2009 +0200 winmm: Fix French translation. --- dlls/winmm/winmm_Fr.rc | 189 ++++++++++++++++++++++++------------------------ 1 files changed, 96 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da81ee2520b996e99b0b1…

1 0

Frédéric Delanoy : notepad: Update French translation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 662b3fb98a0d436985d75356caff267f49f4974d URL: http://source.winehq.org/git/wine.git/?a=commit;h=662b3fb98a0d436985d75356c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 4 16:43:03 2009 +0200 notepad: Update French translation. --- programs/notepad/Fr.rc | 59 ++++++++++++++++++++++++++++------------------- 1 files changed, 35 insertions(+), 24 deletions(-) diff --git a/programs/notepad/Fr.rc b/programs/notepad/Fr.rc index d46711c..f196258 100644 --- a/programs/notepad/Fr.rc +++ b/programs/notepad/Fr.rc @@ -23,6 +23,9 @@ #include "notepad_res.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL MAIN_MENU MENU @@ -39,7 +42,7 @@ MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Quitter", CMD_EXIT } -POPUP "�&dition" { +POPUP "É&dition" { MENUITEM "&Annuler\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR MENUITEM "Co&uper\tCtrl+X", CMD_CUT @@ -47,10 +50,10 @@ POPUP " MENUITEM "C&oller\tCtrl+V", CMD_PASTE MENUITEM "&Effacer\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "Tout &s�lectionner\tCtrl+A", CMD_SELECT_ALL + MENUITEM "Tout &sélectionner\tCtrl+A", CMD_SELECT_ALL MENUITEM "&Heure/Date\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "&Retour � la ligne", CMD_WRAP + MENUITEM "&Retour à la ligne automatique", CMD_WRAP MENUITEM "&Police...", CMD_FONT } POPUP "&Rechercher" { @@ -63,7 +66,7 @@ POPUP "Aid&e" { MENUITEM "&Rechercher...", CMD_HELP_SEARCH MENUITEM "&Utiliser l'aide", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "� &propos du Bloc-notes", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "À &propos du Bloc-notes", CMD_HELP_ABOUT_NOTEPAD } } @@ -74,26 +77,34 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Mise en page" { -LTEXT "&En-t�te:", 0x140, 10, 07, 40, 15 +LTEXT "&En-tête :", 0x140, 10, 07, 50, 15 EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "&Pied de page�:", 0x142, 10, 24, 40, 15 +LTEXT "&Pied de page :", 0x142, 10, 24, 50, 15 EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP -GROUPBOX "&Marges�(millim�tre):", 0x144, 10, 43,160, 45 -LTEXT "&Gauche�:", 0x145, 20, 55, 30, 10, WS_CHILD +GROUPBOX "&Marges (millimètres):", 0x144, 10, 43,160, 45 +LTEXT "&Gauche :", 0x145, 20, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Haut�:", 0x148, 20, 73, 30, 10, WS_CHILD +LTEXT "&Haut :", 0x148, 20, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Droite�:", 0x14B, 100, 55, 30, 10, WS_CHILD +LTEXT "&Droite :", 0x14B, 100, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_RIGHTVALUE, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Bas�:", 0x14E,100, 73, 30, 10, WS_CHILD +LTEXT "&Bas :", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP PUSHBUTTON "Annuler", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "Aid&e", IDHELP, 180, 39, 40, 15, WS_TABSTOP +PUSHBUTTON "&Aide", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Codage", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 59,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" @@ -104,22 +115,22 @@ STRING_ERROR, "ERREUR" STRING_WARNING, "ATTENTION" STRING_INFO, "Information" -STRING_UNTITLED, "(sans-titre)" +STRING_UNTITLED, "(sans titre)" STRING_ALL_FILES, "Tous fichiers (*.*)" STRING_TEXT_FILES_TXT, "Fichiers texte (*.txt)" -STRING_TOOLARGE, "Le fichier '%s' est trop grand pour le bloc-notes.\n \ -Veuillez utiliser un autre �diteur." -STRING_NOTEXT, "Vous n'avez pas entr� de texte. \ +STRING_TOOLARGE, "Le fichier '%s' est trop grand pour le bloc-notes.\n\ +Veuillez utiliser un autre éditeur." +STRING_NOTEXT, "Vous n'avez pas entré de texte. \ Veuillez taper quelque chose et recommencer" -STRING_DOESNOTEXIST, "Le fichier '%s'\nn'existe pas.\n\n \ -Voulez-vous cr�er un nouveau fichier�?" -STRING_NOTSAVED, "Le fichier '%s'\na �t� modifi�\n\n \ -Voulez-vous enregistrer vos modifications�?" -STRING_NOTFOUND, "'%s' non trouv�." -STRING_OUT_OF_MEMORY, "Pas assez de m�moire pour compl�ter cette \ -t�che.\nFermez une ou plusieurs applications pour lib�rer\n\ -de la m�moire." +STRING_DOESNOTEXIST, "Le fichier '%s'\nn'existe pas.\n\n\ +Voulez-vous créer un nouveau fichier ?" +STRING_NOTSAVED, "Le fichier '%s'\na été modifié\n\n \ +Voulez-vous enregistrer vos modifications ?" +STRING_NOTFOUND, "'%s' non trouvé." +STRING_OUT_OF_MEMORY, "Pas assez de mémoire pour terminer cette \ +tâche.\nFermez une ou plusieurs applications pour libérer\n\ +de la mémoire." }

1 0

Frédéric Delanoy : cmd: Fix French translation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 18dbff2a8cf9706a3b82b21e37ab4d54aaca67aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=18dbff2a8cf9706a3b82b21e3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 4 15:21:40 2009 +0200 cmd: Fix French translation. --- programs/cmd/Fr.rc | 262 ++++++++++++++++++++++++++------------------------- 1 files changed, 134 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18dbff2a8cf9706a3b82b…

1 0

David Adam : d3dx9_36: Fix the sprite tests to make them pass in Windows.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: de0b3b21d570eac77865f97283a26ab53c50b67d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de0b3b21d570eac77865f9728… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 3 18:08:19 2009 +0200 d3dx9_36: Fix the sprite tests to make them pass in Windows. --- dlls/d3dx9_36/tests/core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index d465cba..b1379ef 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -75,7 +75,7 @@ static void test_ID3DXSprite(IDirect3DDevice9 *device) HRESULT hr; IDirect3DDevice9_GetDirect3D(device, &d3d); - hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_UNKNOWN, 0, D3DRTYPE_TEXTURE, D3DFMT_A8R8G8B8); + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_DYNAMIC, D3DRTYPE_TEXTURE, D3DFMT_A8R8G8B8); IDirect3D9_Release(d3d); ok (hr == D3D_OK, "D3DFMT_A8R8G8B8 not supported\n"); if (FAILED(hr)) return;

1 0

Frédéric Delanoy : winecfg: Fix French translation & UI display.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 958ba9e1394000ea09cdc5f5d88d397557202577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=958ba9e1394000ea09cdc5f5d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 6 01:57:10 2009 +0200 winecfg: Fix French translation & UI display. --- programs/winecfg/Fr.rc | 298 ++++++++++++++++++++++++------------------------ 1 files changed, 151 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=958ba9e1394000ea09cdc…

1 0

David Adam : d3dx9_36: Fix tests to make them pass in Windows.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: db412878444145f17bf17adad4b3251ac8e39223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db412878444145f17bf17adad… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 3 16:14:54 2009 +0200 d3dx9_36: Fix tests to make them pass in Windows. --- dlls/d3dx9_36/tests/texture.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index c2f47f2..7f10e2d 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -62,15 +62,20 @@ static const unsigned char noimage[4] = { static HRESULT create_file(const char *filename, const unsigned char *data, const unsigned int size) { + DWORD received; HANDLE hfile; - hfile = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + hfile = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); if(hfile == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError()); - WriteFile(hfile, data, size, NULL, NULL); - CloseHandle(hfile); + if(WriteFile(hfile, data, size, &received, NULL)) + { + CloseHandle(hfile); + return D3D_OK; + } - return D3D_OK; + CloseHandle(hfile); + return D3DERR_INVALIDCALL; } static void test_D3DXGetImageInfo()

1 0

Alexandre Julliard : include: Get rid of the no longer used wine/pthread.h.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 1d5cb9d23b71851ba069bdbb91f1d74187b3c7f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d5cb9d23b71851ba069bdbb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 4 11:36:44 2009 +0200 include: Get rid of the no longer used wine/pthread.h. --- include/wine/pthread.h | 67 ------------------------------------------------ libs/wine/port.c | 5 ++- 2 files changed, 3 insertions(+), 69 deletions(-) diff --git a/include/wine/pthread.h b/include/wine/pthread.h deleted file mode 100644 index 561c22c..0000000 --- a/include/wine/pthread.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Definitions for Wine pthread emulation - * - * Copyright 2003 Alexandre Julliard - * - * 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 - */ - -#ifndef __WINE_WINE_PTHREAD_H -#define __WINE_WINE_PTHREAD_H - -struct wine_pthread_callbacks; - -#include <signal.h> - -#ifndef HAVE_SIGSET_T -struct sigset_t; -typedef struct sigset_t sigset_t; -#endif - -/* thread information used to creating and exiting threads */ -struct wine_pthread_thread_info -{ - void *stack_base; /* base address of the stack */ - size_t stack_size; /* size of the stack */ - void *teb_base; /* base address of the TEB */ - size_t teb_size; /* size of the TEB (possibly including signal stack) */ - unsigned short teb_sel; /* selector to use for TEB */ - int pid; /* Unix process id */ - int tid; /* Unix thread id */ - void (*entry)( struct wine_pthread_thread_info *info ); /* thread entry point */ - long exit_status; /* thread exit status when calling wine_pthread_exit_thread */ -}; - -struct wine_pthread_functions -{ - void (*init_process)( const struct wine_pthread_callbacks *callbacks, size_t size ); - void (*init_thread)( struct wine_pthread_thread_info *info ); - int (*create_thread)( struct wine_pthread_thread_info *info ); - void (*init_current_teb)( struct wine_pthread_thread_info *info ); - void * (*get_current_teb)(void); -#ifdef __GNUC__ - void (* __attribute__((noreturn)) exit_thread)( struct wine_pthread_thread_info *info ); - void (* __attribute__((noreturn)) abort_thread)( long status ); -#else - void (*exit_thread)( struct wine_pthread_thread_info *info ); - void (*abort_thread)( long status ); -#endif - int (*sigprocmask)( int how, const sigset_t *newset, sigset_t *oldset ); -}; - -extern void wine_pthread_get_functions( struct wine_pthread_functions *functions, size_t size ); -extern void wine_pthread_set_functions( const struct wine_pthread_functions *functions, size_t size ); - -#endif /* __WINE_WINE_PTHREAD_H */ diff --git a/libs/wine/port.c b/libs/wine/port.c index cfd3bcd..1e05e2b 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -26,9 +26,10 @@ #include <sys/types.h> #include "wine/library.h" -#include "wine/pthread.h" -static struct wine_pthread_functions pthread_functions; +/* no longer used, for backwards compatibility only */ +struct wine_pthread_functions; +static void *pthread_functions[8]; /*********************************************************************** * wine_pthread_get_functions

1 0

Alexandre Julliard : winetest: Build exe resources as separate .res files.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 0dc951694bfeceebeacbb4148e66bb663ba87d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc951694bfeceebeacbb4148… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 4 11:20:09 2009 +0200 winetest: Build exe resources as separate .res files. --- .gitignore | 2 +- configure | 10 +++++++--- configure.ac | 10 +++++++--- programs/winetest/Makefile.in | 21 ++++++--------------- programs/winetest/winetest.rc | 2 -- tools/make_makefiles | 2 +- 6 files changed, 22 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index f096f4a..5303e1c 100644 --- a/.gitignore +++ b/.gitignore @@ -197,7 +197,7 @@ programs/winedbg/dbg.tab.h programs/winedbg/debug.yy.c programs/winedbg/winedbg.man programs/winetest/*_test.exe -programs/winetest/tests.rc +programs/winetest/*_test.rc programs/winhlp32/macro.lex.yy.c server/wineserver server/wineserver-installed diff --git a/configure b/configure index 97bb65a..9e59d11 100755 --- a/configure +++ b/configure @@ -28762,10 +28762,14 @@ for dir in $ALL_TEST_DIRS do if test "$dir" != "\\" then - testname=`expr $dir : '$.*$/tests'`_test.exe + testname=`expr $dir : '$.*$/tests'`_test ALL_WINETEST_DEPENDS="$ALL_WINETEST_DEPENDS -$testname: \$(DLLDIR)/$dir/$testname\$(DLLEXT) - cp \$(DLLDIR)/$dir/$testname\$(DLLEXT) \$@ && \$(STRIP) \$@" + +$testname.exe: \$(DLLDIR)/$dir/$testname.exe\$(DLLEXT) + cp \$(DLLDIR)/$dir/$testname.exe\$(DLLEXT) \$@ && \$(STRIP) \$@ +$testname.rc: + echo \"$testname.exe TESTRES \\\"$testname.exe\\\"\" >\$@ || (\$(RM) \$@ && false) +$testname.res: $testname.rc $testname.exe" fi done diff --git a/configure.ac b/configure.ac index c6843d9..23cf7fe 100644 --- a/configure.ac +++ b/configure.ac @@ -2527,10 +2527,14 @@ for dir in $ALL_TEST_DIRS do if test "$dir" != "\\" then - testname=`expr $dir : '$.*$/tests'`_test.exe + testname=`expr $dir : '$.*$/tests'`_test ALL_WINETEST_DEPENDS="$ALL_WINETEST_DEPENDS -$testname: \$(DLLDIR)/$dir/$testname\$(DLLEXT) - cp \$(DLLDIR)/$dir/$testname\$(DLLEXT) \$@ && \$(STRIP) \$@" + +$testname.exe: \$(DLLDIR)/$dir/$testname.exe\$(DLLEXT) + cp \$(DLLDIR)/$dir/$testname.exe\$(DLLEXT) \$@ && \$(STRIP) \$@ +$testname.rc: + echo \"$testname.exe TESTRES \\\"$testname.exe\\\"\" >\$@ || (\$(RM) \$@ && false) +$testname.res: $testname.rc $testname.exe" fi done diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index bd1251f..90cd983 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -20,25 +20,18 @@ RC_SRCS = \ SVG_SRCS = winetest.svg -(a)MAKE_PROG_RULES@ - ALL_TEST_DIRS = @ALL_TEST_DIRS@ -TESTBINS = $(ALL_TEST_DIRS:%/tests=%_test.exe) - -(a)ALL_WINETEST_DEPENDS@ - -# Special rules +TESTBINS = $(ALL_TEST_DIRS:%/tests=%_test.exe) +TESTRCS = $(TESTBINS:.exe=.rc) +EXTRA_OBJS = $(TESTRCS:.rc=.res) -winetest.res: $(TESTBINS) +(a)MAKE_PROG_RULES@ -tests.rc: Makefile.in $(TOPOBJDIR)/config.status - (for i in $(TESTBINS); do echo "$$i TESTRES \"$$i\""; done) >$@ || ($(RM) $@ && false) +(a)ALL_WINETEST_DEPENDS@ clean:: - $(RM) tests.rc dist.res winetest-dist.exe $(TESTBINS) - -depend: tests.rc + $(RM) winetest-dist.exe $(TESTBINS) $(TESTRCS) # Rules for building distributable executable @@ -53,5 +46,3 @@ winetest-dist.exe winetest-dist.exe.so: $(OBJS) dist.res Makefile.in dist.res: build.nfo @DEPENDENCIES@ # everything below this line is overwritten by make depend - -winetest.res: tests.rc diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 4d406f2..8056a25 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -82,5 +82,3 @@ END /* @makedep: winetest.ico */ IDI_WINE ICON "winetest.ico" - -#include "tests.rc" diff --git a/tools/make_makefiles b/tools/make_makefiles index 99a120c..b1766a7 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -74,8 +74,8 @@ my @ignores = ( "dlls/*/tests/testlist.c", "include/config.h", "include/stamp-h", - "programs/winetest/tests.rc", "programs/winetest/*_test.exe", + "programs/winetest/*_test.rc", ); # Source files and their resulting target to ignore

1 0

Alexandre Julliard : loader: Get rid of the pthread support routines.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 4fda657a0a47ea0521b2d8453ecb4a8a6cbd7a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fda657a0a47ea0521b2d8453… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 4 11:20:39 2009 +0200 loader: Get rid of the pthread support routines. --- loader/Makefile.in | 13 +-- loader/main.c | 1 - loader/main.h | 6 -- loader/pthread.c | 241 ---------------------------------------------------- 4 files changed, 5 insertions(+), 256 deletions(-) diff --git a/loader/Makefile.in b/loader/Makefile.in index afe3f73..0ce816a 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -6,10 +6,7 @@ MODULE = wine C_SRCS = \ main.c \ - preloader.c \ - pthread.c - -MAIN_OBJS = pthread.o main.o + preloader.c EXTRA_BINARIES = @EXTRA_BINARIES@ @@ -39,11 +36,11 @@ LDEXECFLAGS = @LDEXECFLAGS@ wine-preloader: preloader.o Makefile.in $(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c000000 preloader.o $(LIBPORT) $(LDFLAGS) -wine: $(MAIN_OBJS) Makefile.in - $(CC) -o $@ $(LDEXECFLAGS) $(MAIN_OBJS) $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_LOCAL) +wine: main.o Makefile.in + $(CC) -o $@ $(LDEXECFLAGS) main.o $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_LOCAL) -wine-installed: $(MAIN_OBJS) Makefile.in - $(CC) -o $@ $(LDEXECFLAGS) $(MAIN_OBJS) $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_INSTALL) +wine-installed: main.o Makefile.in + $(CC) -o $@ $(LDEXECFLAGS) main.o $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_INSTALL) $(EXTRA_BINARIES:%=__install__%): $(EXTRA_BINARIES) $(DESTDIR)$(bindir) dummy f=`expr $@ : '__install__$.*$'` && $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f diff --git a/loader/main.c b/loader/main.c index e0588d1..6de500e 100644 --- a/loader/main.c +++ b/loader/main.c @@ -215,7 +215,6 @@ int main( int argc, char *argv[] ) reserve_area( wine_main_preload_info[i].addr, wine_main_preload_info[i].size ); } - init_pthread_functions(); wine_init( argc, argv, error, sizeof(error) ); fprintf( stderr, "wine: failed to initialize: %s\n", error ); exit(1); diff --git a/loader/main.h b/loader/main.h index b06423f..7d4d4dc 100644 --- a/loader/main.h +++ b/loader/main.h @@ -28,10 +28,4 @@ struct wine_preload_info size_t size; }; -#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) -extern void init_pthread_functions(void) __attribute__((visibility ("hidden"))); -#else -extern void init_pthread_functions(void); -#endif - #endif /* __WINE_LOADER_MAIN_H */ diff --git a/loader/pthread.c b/loader/pthread.c deleted file mode 100644 index 712bd37..0000000 --- a/loader/pthread.c +++ /dev/null @@ -1,241 +0,0 @@ -/* - * Wine threading routines using the pthread library - * - * Copyright 2003 Alexandre Julliard - * - * 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 "config.h" -#include "wine/port.h" - -#include <assert.h> -#include <stdlib.h> -#include <signal.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#include <string.h> -#include <sys/types.h> -#ifdef HAVE_SYS_MMAN_H -#include <sys/mman.h> -#endif -#ifdef HAVE_MACH_MACH_H -#include <mach/mach.h> -#endif -#ifdef HAVE_SYS_THR_H -#include <sys/ucontext.h> -#include <sys/thr.h> -#endif -#include <pthread.h> -#ifdef HAVE_PTHREAD_NP_H -#include <pthread_np.h> -#endif - -#include "wine/library.h" -#include "wine/pthread.h" - -static int init_done; -static int nb_threads = 1; - -#if !defined(__i386__) && !defined(__x86_64__) -static pthread_key_t teb_key; -#endif - -#if defined(__x86_64__) && defined(__linux__) -#include <asm/prctl.h> -extern int arch_prctl(int func, void *ptr); -#endif - -/*********************************************************************** - * init_process - * - * Initialization for a newly created process. - */ -static void init_process( const struct wine_pthread_callbacks *callbacks, size_t size ) -{ - init_done = 1; -} - - -/*********************************************************************** - * init_thread - * - * Initialization for a newly created thread. - */ -static void init_thread( struct wine_pthread_thread_info *info ) -{ - /* retrieve the stack info (except for main thread) */ - if (init_done) - { -#ifdef HAVE_PTHREAD_GETATTR_NP - pthread_attr_t attr; - pthread_getattr_np( pthread_self(), &attr ); - pthread_attr_getstack( &attr, &info->stack_base, &info->stack_size ); - pthread_attr_destroy( &attr ); -#elif defined(HAVE_PTHREAD_ATTR_GET_NP) - pthread_attr_t attr; - pthread_attr_init( &attr ); - pthread_attr_get_np( pthread_self(), &attr ); - pthread_attr_getstack( &attr, &info->stack_base, &info->stack_size ); - pthread_attr_destroy( &attr ); -#elif defined(HAVE_PTHREAD_GET_STACKSIZE_NP) && defined(HAVE_PTHREAD_GET_STACKADDR_NP) - char dummy; - info->stack_size = pthread_get_stacksize_np(pthread_self()); - info->stack_base = pthread_get_stackaddr_np(pthread_self()); - /* if base is too large assume it's the top of the stack instead */ - if ((char *)info->stack_base > &dummy) - info->stack_base = (char *)info->stack_base - info->stack_size; -#else - /* assume that the stack allocation is page aligned */ - char dummy; - size_t page_size = getpagesize(); - char *stack_top = (char *)((unsigned long)&dummy & ~(page_size - 1)) + page_size; - info->stack_base = stack_top - info->stack_size; -#endif - } -} - - -/*********************************************************************** - * create_thread - */ -static int create_thread( struct wine_pthread_thread_info *info ) -{ - pthread_t id; - pthread_attr_t attr; - int ret = 0; - - pthread_attr_init( &attr ); - pthread_attr_setstacksize( &attr, info->stack_size ); - pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_DETACHED ); - pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ); /* force creating a kernel thread on Solaris */ - interlocked_xchg_add( &nb_threads, 1 ); - if (pthread_create( &id, &attr, (void * (*)(void *))info->entry, info )) - { - interlocked_xchg_add( &nb_threads, -1 ); - ret = -1; - } - pthread_attr_destroy( &attr ); - return ret; -} - - -/*********************************************************************** - * init_current_teb - * - * Set the current TEB for a new thread. - */ -static void init_current_teb( struct wine_pthread_thread_info *info ) -{ -#ifdef __i386__ - /* On the i386, the current thread is in the %fs register */ - LDT_ENTRY fs_entry; - - wine_ldt_set_base( &fs_entry, info->teb_base ); - wine_ldt_set_limit( &fs_entry, info->teb_size - 1 ); - wine_ldt_set_flags( &fs_entry, WINE_LDT_FLAGS_DATA|WINE_LDT_FLAGS_32BIT ); - wine_ldt_init_fs( info->teb_sel, &fs_entry ); -#elif defined(__x86_64__) - /* On x86_64, it's in %gs */ -# ifdef __linux__ - arch_prctl(ARCH_SET_GS, info->teb_base); -# else -# error Please define setting %gs for your architecture -# endif -#else - if (!init_done) /* first thread */ - pthread_key_create( &teb_key, NULL ); - pthread_setspecific( teb_key, info->teb_base ); -#endif - - /* set pid and tid */ - info->pid = getpid(); -#ifdef __sun - info->tid = pthread_self(); /* this should return the lwp id on solaris */ -#elif defined(__APPLE__) - info->tid = mach_thread_self(); -#elif defined(__FreeBSD__) - { - long lwpid; - thr_self( &lwpid ); - info->tid = (int) lwpid; - } -#else - info->tid = gettid(); -#endif -} - - -/*********************************************************************** - * get_current_teb - */ -static void *get_current_teb(void) -{ -#ifdef __i386__ - void *ret; - __asm__( ".byte 0x64\n\tmovl 0x18,%0" : "=r" (ret) ); - return ret; -#elif defined(__x86_64__) - void *ret; - __asm__( ".byte 0x65\n\tmovq 0x30,%0" : "=r" (ret) ); - return ret; -#else - return pthread_getspecific( teb_key ); -#endif -} - - -/*********************************************************************** - * exit_thread - */ -static void DECLSPEC_NORETURN exit_thread( struct wine_pthread_thread_info *info ) -{ - if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) exit( info->exit_status ); - wine_ldt_free_fs( info->teb_sel ); - if (info->teb_size) munmap( info->teb_base, info->teb_size ); - pthread_exit( (void *)info->exit_status ); -} - - -/*********************************************************************** - * abort_thread - */ -static void DECLSPEC_NORETURN abort_thread( long status ) -{ - if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status ); - pthread_exit( (void *)status ); -} - - -/*********************************************************************** - * pthread_functions - */ -static const struct wine_pthread_functions pthread_functions = -{ - init_process, - init_thread, - create_thread, - init_current_teb, - get_current_teb, - exit_thread, - abort_thread, - pthread_sigmask -}; - -void init_pthread_functions(void) -{ - wine_pthread_set_functions( &pthread_functions, sizeof(pthread_functions) ); -}

1 0

Łukasz Wojniłowicz : Polish translation for release 1.1.25
by Jeremy Newman July 6, 2009

July 6, 2009

Module: website Branch: master Commit: 094977b2cb18b7b0a0087001c32639164c0986bc URL: http://source.winehq.org/git/website.git/?a=commit;h=094977b2cb18b7b0a00870… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Jul 3 19:36:40 2009 +0200 Polish translation for release 1.1.25 --- news/pl/2009070301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2009070301.xml b/news/pl/2009070301.xml new file mode 100644 index 0000000..e81a1bb --- /dev/null +++ b/news/pl/2009070301.xml @@ -0,0 +1,17 @@ +<news> +<date>Lipiec 3, 2009</date> +<title>Wydano Wine 1.1.25</title> +<body> + Wydanie rozwojowe Wine 1.1.25 jest już dostępne. + <a href="{$root}/announce/1.1.25">Co nowego</a> w tym wydaniu: +<ul> + <li>Masa aktualizacji plików językowych.</li> + <li>Wsparcie dla rozmaitych kodowań Unicode w Notatniku.</li> + <li>Ulepszone zarządzanie pamięcią, w szczególności dla OpenGL.</li> + <li>Menu pulpitu są teraz oczyszczane automatycznie.</li> + <li>Początek implementacji bliblioteki DLL windowscodecs.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.25.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexander Nicolaysen Sørnes : application: Order cat list on edit app page
by Alexander Nicolaysen Sørnes July 4, 2009

July 4, 2009

Module: appdb Branch: master Commit: 82999b22c7e5fd56d73000cc1f836bee720994ee URL: http://source.winehq.org/git/appdb.git/?a=commit;h=82999b22c7e5fd56d73000cc… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.site> Date: Fri Jul 3 00:17:59 2009 +0200 application: Order cat list on edit app page --- include/application.php | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/include/application.php b/include/application.php index 137580c..c5ef52b 100644 --- a/include/application.php +++ b/include/application.php @@ -565,9 +565,20 @@ class Application { echo '<td><input size="20" type="text" name="sAppName" value="'.$this->sName.'"></td></tr>',"\n"; // app Category - $w = new TableVE("view"); echo '<tr valign=top><td class="color0">Category</td><td>',"\n"; - echo $w->make_option_list("iAppCatId", $this->iCatId,"appCategory","catId","catName"); + + $aCategories = category::getOrderedList(true); + $aCatNames = array(); + $aCatIds = array(); + + foreach($aCategories as $oCategory) + { + $aCatNames[] = $oCategory->sName; + $aCatIds[] = $oCategory->objectGetId(); + } + + echo html_select("iAppCatId",$aCatIds,$this->iCatId, $aCatNames); + echo '</td></tr>',"\n"; $oVendor = new vendor($this->iVendorId);

1 0

Alexander Nicolaysen Sørnes : category: Order cat list on add/edit form
by Alexander Nicolaysen Sørnes July 4, 2009

July 4, 2009

Module: appdb Branch: master Commit: 8060eab22a49167dd290db0037df262eae56b192 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8060eab22a49167dd290db00… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.site> Date: Thu Jul 2 23:27:50 2009 +0200 category: Order cat list on add/edit form --- include/category.php | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/include/category.php b/include/category.php index c0c6bc1..dc51bd4 100644 --- a/include/category.php +++ b/include/category.php @@ -160,11 +160,20 @@ class Category { } /* Get all category objects, ordered and with category names indented - according to subcategory level */ - static function getOrderedList() + according to subcategory level. + Optionally includes the 'Main' top category. */ + static function getOrderedList($bIncludeMain = false) { $oCat = new category(); - return $oCat->getSubCatList(0); + + if(!$bIncludeMain) + return $oCat->getSubCatList(0); + + $oCat->sName = 'Main'; + $aCats = array($oCat); + $aCats += $oCat->getSubCatList(1); + + return $aCats; } function objectGetMail($sAction, $bMailSubmitter, $bParentAction) @@ -278,18 +287,14 @@ class Category { function outputEditor() { - $sQuery = "SELECT catId, catName FROM appCategory WHERE catId!='?'"; - $hResult = query_parameters($sQuery, $this->iCatId); - - /* Add the virtual 'Main' category */ - $aCatIds = array(0); - $aCatNames = array('Main'); + $aCategories = category::getOrderedList(true); + $aCatNames = array(); + $aCatIds = array(); - /* Add the rest from the database */ - while($oRow = query_fetch_object($hResult)) + foreach($aCategories as $oCategory) { - $aCatIds[] = $oRow->catId; - $aCatNames[] = $oRow->catName; + $aCatNames[] = $oCategory->sName; + $aCatIds[] = $oCategory->objectGetId(); } echo "<table border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"2\">

1 0

Maik Schulz : website: German translation for release 1.1.25 news item
by Maik Schulz July 3, 2009

July 3, 2009

Module: website Branch: master Commit: 808f79629b7bb14c6ffc6a5a09340134f6ba8dab URL: http://source.winehq.org/git/website.git/?a=commit;h=808f79629b7bb14c6ffc6a… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Fri Jul 3 23:39:40 2009 +0200 website: German translation for release 1.1.25 news item --- news/de/2009070301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2009070301.xml b/news/de/2009070301.xml new file mode 100644 index 0000000..cb84246 --- /dev/null +++ b/news/de/2009070301.xml @@ -0,0 +1,17 @@ +<news> +<date>3. Juli 2009</date> +<title>Wine 1.1.25 Freigegeben</title> +<body> + Die Entwicklungsversion 1.1.25 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.1.25">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Sehr viele neue Übersetzungen.</li> + <li>Unterstützung für diverse Unicode-Varianten in Notepad.</li> + <li>Verbessertes Speicher-Management, insbesondere für OpenGL.</li> + <li>Desktop Menüs werden jetzt automatisch aufgeräumt.</li> + <li>Anfang einer Implementierung einer windowscodecs DLL.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.25.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.1.25
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: website Branch: master Commit: a4054d6507c2ced72858acdd2dbde3a0b7c5522c URL: http://source.winehq.org/git/website.git/?a=commit;h=a4054d6507c2ced72858ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 18:35:11 2009 +0200 Wine release 1.1.25 --- news/en/2009070301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2009070301.xml b/news/en/2009070301.xml new file mode 100644 index 0000000..d68e3ba --- /dev/null +++ b/news/en/2009070301.xml @@ -0,0 +1,17 @@ +<news> +<date>July 3, 2009</date> +<title>Wine 1.1.25 Released</title> +<body> + The Wine development release 1.1.25 is now available. + <a href="{$root}/announce/1.1.25">What's new</a> in this release: +<ul> + <li>A ton of translation updates.</li> + <li>Support for various Unicode file encodings in Notepad.</li> + <li>Improved memory management, especially for OpenGL.</li> + <li>Desktop menus now cleaned up automatically.</li> + <li>Beginnings of a windowscodecs DLL implementation.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.25.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.1.25 : Alexandre Julliard : Release 1.1.25
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: refs/tags/wine-1.1.25 Tag: 2b3e7bc9c8ab41f33afa65decccbc28464b956b5 URL: http://source.winehq.org/git/wine.git/?a=tag;h=2b3e7bc9c8ab41f33afa65decccb… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 18:28:33 2009 +0200 Release 1.1.25

1 0

Alexandre Julliard : Release 1.1.25.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: a6beb5066884a4fdb7270d84c012ba8ef8a64342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6beb5066884a4fdb7270d84c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 18:28:33 2009 +0200 Release 1.1.25. --- ANNOUNCE | 1294 ++++++++++++++++++++++++++++++++++++------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 777 insertions(+), 537 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a6beb5066884a4fdb7270…

1 0

Alexandre Julliard : transl: Also retrieve .mc sources from the makefile.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: tools Branch: master Commit: cd74b5cfc59d16788f3cc2424ffb34aeaae5c4f2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cd74b5cfc59d16788f3cc242… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 18:07:01 2009 +0200 transl: Also retrieve .mc sources from the makefile. --- transl/scripts/checkmakefile.pl | 45 +++++++++++++++++++++++++------------- 1 files changed, 29 insertions(+), 16 deletions(-) diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index 0b98088..bdc9fcf 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -1,11 +1,15 @@ -#!/usr/bin/perl +#!/usr/bin/perl -w # Helper script - analyze one Makefile, run wrc --verify-translation # on resource files and call ver.pl to parse the results +use strict; use Cwd; use File::Basename; +# configuration parameters +my (%CONFIG, $srcdir, $objdir, $toolsdir, $workdir, $scriptsdir, $wrc); + sub shell($) { my $cmd = shift; @@ -29,13 +33,23 @@ sub mycheck } my @rcfiles; + my @srcs; foreach my $f (@files) { next if $f =~ m/^\s*$/; if ($f =~ m/version.rc$/) { - print "--- Ignoring ".$files[$i]."\n" unless (exists $ENV{"NOVERBOSE"}); + print "--- Ignoring $f\n" unless (exists $ENV{"NOVERBOSE"}); next; } + if ($f =~ m/.mc$/) + { + $f .= ".rc"; + push @srcs, "$objdir/$dir/$f"; + } + else + { + push @srcs, "$srcdir/$dir/$f"; + } push @rcfiles, $f; } return unless @rcfiles; @@ -50,7 +64,7 @@ sub mycheck $norm_fn =~ s/[^a-zA-Z0-9]/-/g; my $targets = join( " ", map { (my $ret = $_) =~ s/.rc$/.res/; $ret; } @rcfiles ); - my $srcs = join( " ", map { "$srcdir/$dir/$_"; } @rcfiles ); + my $srcs = join( " ", @srcs ); my $objs = join( " ", map { (my $ret = "$objdir/$dir/$_") =~ s/.rc$/.res/; $ret; } @rcfiles ); shell "make -C $objdir/$dir -s $targets"; @@ -59,7 +73,7 @@ sub mycheck if ("$dir" eq "dlls/kernel32") { shell "$scriptsdir/ver.pl \"$dir\" \"$workdir\" nonlocale $scriptsdir <$workdir/ver.txt"; - print STDERR "*** $name [$defs] (locale run)\n"; + print STDERR "*** $dir [$defs] (locale run)\n"; shell "$scriptsdir/ver.pl \"$dir\" \"$workdir\" locale $scriptsdir <$workdir/ver.txt"; } else { shell "$scriptsdir/ver.pl \"$dir\" \"$workdir\" normal $scriptsdir <$workdir/ver.txt"; @@ -117,7 +131,7 @@ if ($srcdir eq "" || $wrc eq "/tools/wrc/wrc" || $workdir eq "") die("Config entry for SOURCEROOT, WRCROOT or WORKDIR missing\n"); } -(a)makefiles = @ARGV; +my @makefiles = @ARGV; if (!@makefiles) { @makefiles = split(/\s/,`find $srcdir/ -name Makefile.in -print`); @@ -138,27 +152,26 @@ foreach my $makefile (@makefiles) } my $defs = ""; + my @files = (); open(MAKEFILE, "<$makefile") or die "cannot open $makefile"; while (<MAKEFILE>) { + while (m/\\$/) + { + chop; + chop; + $_ .= <MAKEFILE>; + } if (m/EXTRARCFLAGS\s*=\s*(.*)/) { $defs = $1; last if ($defs =~ /res16/); # 16-bit resources not supported } - if (m/^RC_SRCS *=/) + if (m/^(MC|RC)_SRCS\s*=\s*(.*)$/) { - while (m/\\$/) - { - chop; - chop; - $_ .= <MAKEFILE>; - } - m/^RC_SRCS\s*=\s*(.*)$/; - my @files = split(/\s+/, $1); - &mycheck($path,$defs,@files); - last; + push @files, split(/\s+/, $2); } } close MAKEFILE; + &mycheck($path,$defs,@files) if @files; }

1 0

Paul Vriens : notepad: Add Dutch translations.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 44da9ba361cbdca040e756fce2e6e22638107415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44da9ba361cbdca040e756fce… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 3 15:27:40 2009 +0200 notepad: Add Dutch translations. --- programs/notepad/Nl.rc | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Nl.rc b/programs/notepad/Nl.rc index 77ee3e1..f543b13 100644 --- a/programs/notepad/Nl.rc +++ b/programs/notepad/Nl.rc @@ -91,6 +91,14 @@ PUSHBUTTON "Annuleren", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP PUSHBUTTON "&Help", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Codering:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" @@ -117,4 +125,14 @@ Wilt u de wijzigingen opslaan?" STRING_NOTFOUND, "'%s' kan niet worden gevonden." STRING_OUT_OF_MEMORY, "Onvoldoende geheugen. \ \nSluit een of meer applicaties om de hoeveelheid\nbeschikbaar geheugen te vergroten." + +STRING_UNICODE_LE, "Unicode (UTF-16)" +STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +Dit bestand bevat Unicode tekens welke verloren zullen gaan\n\ +als dit bestand wordt opgeslagen in de %s codering.\n\ +Om deze tekens te behouden, klikt u op Annuleren en selecteert\n\ +daarna een van de Unicode-opties in de Codering keuzelijst.\n\ +Wilt u doorgaan?" }

1 0

Alexander Nicolaysen Sørnes : wordpad: Update Norwegian Bokmål translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 0bb5ab6355d22474dfe5ba61670c6ef7d2e993c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bb5ab6355d22474dfe5ba616… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 3 02:15:16 2009 +0200 wordpad: Update Norwegian Bokmål translation. --- programs/wordpad/No.rc | 46 +++++++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 21 deletions(-) diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 392b9d6..5a4fdbf 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -1,5 +1,5 @@ /* - * Copyright 2006-2008 by Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2006-2009 by Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,6 +18,8 @@ #include "wordpad.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDM_MAINMENU MENU DISCARDABLE @@ -25,12 +27,12 @@ BEGIN POPUP "&Fil" BEGIN MENUITEM "&Ny...\tCtrl+N", ID_FILE_NEW - MENUITEM "&�pne...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Åpne...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Lagre\tCtrl+S", ID_FILE_SAVE MENUITEM "Lagre &som...", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "&Skriv ut...\tCtrl+P", ID_PRINT - MENUITEM "&Forh�ndsvisning...", ID_PREVIEW + MENUITEM "&Forhåndsvisning...", ID_PREVIEW MENUITEM "&Utskriftformat...", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "&Avslutt", ID_FILE_EXIT @@ -46,8 +48,8 @@ BEGIN MENUITEM "&Fjern\tDEL", ID_EDIT_CLEAR MENUITEM "&Merk alt\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&S�k etter...\tCrtl+F", ID_FIND - MENUITEM "S�k etter &neste\tF3", ID_FIND_NEXT + MENUITEM "&Søk etter...\tCrtl+F", ID_FIND + MENUITEM "Søk etter &neste\tF3", ID_FIND_NEXT MENUITEM "E&rstatt...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "S&krivebeskyttet", ID_EDIT_READONLY @@ -55,7 +57,7 @@ BEGIN MENUITEM SEPARATOR POPUP "&Ekstra" BEGIN - MENUITEM "&Info om merket omr�de", ID_EDIT_SELECTIONINFO + MENUITEM "&Info om merket område", ID_EDIT_SELECTIONINFO MENUITEM "Tegn&format", ID_EDIT_CHARFORMAT MENUITEM "Stan&dard tegnformat", ID_EDIT_DEFCHARFORMAT MENUITEM "&Avsnittformat", ID_EDIT_PARAFORMAT @@ -64,7 +66,7 @@ BEGIN END POPUP "&Vis" BEGIN - MENUITEM "Verk&t�ylinje", ID_TOGGLE_TOOLBAR + MENUITEM "Verk&tøylinje", ID_TOGGLE_TOOLBAR MENUITEM "&Formatlinje", ID_TOGGLE_FORMATBAR MENUITEM "&Linjal", ID_TOGGLE_RULER MENUITEM "&Statuslinje", ID_TOGGLE_STATUSBAR @@ -136,9 +138,9 @@ BEGIN GROUPBOX "Innrykk", -1, 10, 10, 120, 68 LTEXT "Venstre", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "H�yre", -1, 15, 40, 40, 13 + LTEXT "Høyre", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "F�rste linje", -1, 15, 58, 40, 13 + LTEXT "Første linje", -1, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Justering", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST @@ -169,8 +171,8 @@ BEGIN RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "Bryt tekst etter v&indusbredden", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "Bryt tekst etter &margen", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "Verkt�ylinjer", -1, 150, 10, 120, 85 - CHECKBOX "&Verkt�ylinje", IDC_PAGEFMT_TB, 160, 20, 80, 15 + GROUPBOX "Verktøylinjer", -1, 150, 10, 120, 85 + CHECKBOX "&Verktøylinje", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatlinje", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "&Linjal", IDC_PAGEFMT_RU, 160, 56, 80, 15 CHECKBOX "&Statuslinje", IDC_PAGEFMT_SB, 160, 74, 80, 15 @@ -195,7 +197,7 @@ END STRINGTABLE DISCARDABLE BEGIN STRING_ALIGN_LEFT, "Venstrestilt" - STRING_ALIGN_RIGHT, "H�yrestilt" + STRING_ALIGN_RIGHT, "Høyrestilt" STRING_ALIGN_CENTER, "Midtstilt" END @@ -217,7 +219,7 @@ BEGIN STRING_PREVIEW_NEXTPAGE, "Neste side" STRING_PREVIEW_PREVPAGE, "Forrige side" STRING_PREVIEW_TWOPAGES, "To sider" - STRING_PREVIEW_ONEPAGE, "�n side" + STRING_PREVIEW_ONEPAGE, "Én side" STRING_PREVIEW_CLOSE, "Lukk" END @@ -229,16 +231,18 @@ END STRINGTABLE DISCARDABLE BEGIN STRING_DEFAULT_FILENAME, "Dokument" - STRING_PROMPT_SAVE_CHANGES, "Lagre endringer i �%s�?" - STRING_SEARCH_FINISHED, "Ferdig med � s�ke i dokumentet." + STRING_PROMPT_SAVE_CHANGES, "Lagre endringer i «%s»?" + STRING_SEARCH_FINISHED, "Ferdig med å søke i dokumentet." STRING_LOAD_RICHED_FAILED, "Klarte ikke laste RichEdit-biblioteket." - STRING_SAVE_LOSEFORMATTING, "Du har valgt � lagre i rent tekstformat, noe som " \ - "vil f�re til at all formatering g�r tapt. Er du " \ - "sikker p� at du vil fortsette?" + STRING_SAVE_LOSEFORMATTING, "Du har valgt å lagre i rent tekstformat, noe som " \ + "vil føre til at all formatering går tapt. Er du " \ + "sikker på at du vil fortsette?" STRING_INVALID_NUMBER, "Ugyldig tallformat" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" STRING_WRITE_FAILED, "Klarte ikke lagre filen." - STRING_WRITE_ACCESS_DENIED, "Du har ikke tilgang til � lagre filen." - STRING_OPEN_FAILED, "Klarte ikke �pne filen." - STRING_OPEN_ACCESS_DENIED, "Du har ikke tilgang til � �pne filen." + STRING_WRITE_ACCESS_DENIED, "Du har ikke tilgang til å lagre filen." + STRING_OPEN_FAILED, "Klarte ikke åpne filen." + STRING_OPEN_ACCESS_DENIED, "Du har ikke tilgang til å åpne filen." + STRING_PRINTING_NOT_IMPLEMENTED, "Utskriftfunksjonen er ikke laget ennå." + STRING_MAX_TAB_STOPS, "Kan ikke legge til mer enn 32 tabulatorstopp." END

1 0

Nikolay Sivov : oleacc: Add ObjectFromLresult stub.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: b2f6b44b25a48d67467fbe3df558882af2061f68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f6b44b25a48d67467fbe3df… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jul 3 17:00:12 2009 +0400 oleacc: Add ObjectFromLresult stub. --- dlls/oleacc/main.c | 6 ++++++ dlls/oleacc/oleacc.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 0e7b78e..34bdb61 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -40,6 +40,12 @@ HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, return E_NOTIMPL; } +HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, void **ppObject ) +{ + FIXME("%ld %s %ld %p\n", result, debugstr_guid(riid), wParam, ppObject ); + return E_NOTIMPL; +} + LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) { FIXME("%s %ld %p\n", debugstr_guid(riid), wParam, pAcc ); diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 2736a3d..6ace542 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -16,5 +16,5 @@ @ stub IID_IAccessibleHandler @ stub LIBID_Accessibility @ stdcall LresultFromObject(ptr long ptr) -@ stub ObjectFromLresult +@ stdcall ObjectFromLresult(long ptr long ptr) @ stub WindowFromAccessibleObject

1 0

Paul Vriens : mlang/tests: Prevent messing up the codepages on Win98.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: d61f18ef06e6c7d4a444b9ba66652e0cf4dc30eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d61f18ef06e6c7d4a444b9ba6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 3 13:18:45 2009 +0200 mlang/tests: Prevent messing up the codepages on Win98. --- dlls/mlang/tests/mlang.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 7a1290d..26e89a0 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1962,6 +1962,20 @@ static void test_IsCodePageInstallable(IMultiLanguage2 *ml2) UINT i; HRESULT hr; + SetLastError(0xdeadbeef); + lstrcmpW(NULL, NULL); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + /* This corruption leads (sometimes) to test failures in oleaut32 but also + * to the inability to use the Regional Settings. + * This only seems to be an issue with Win98 and IE6 (mlang version 6.0.2800.1106). + * + * A reboot restores the codepages again. + */ + win_skip("IsCodePageInstallable could mess up the codepages on Win98\n"); + return; + } + for (i = 0; i < 0xffff; i++) { hr = IMultiLanguage2_IsCodePageInstallable(ml2, i); @@ -2033,6 +2047,7 @@ START_TEST(mlang) test_multibyte_to_unicode_translations(iML2); test_IMultiLanguage2_ConvertStringFromUnicode(iML2); + test_IsCodePageInstallable(iML2); IMultiLanguage2_Release(iML2);

1 0

Alexandre Julliard : kernel32: Compile . mc files to resources as independent files.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: d6cc6ca2c104bbddc35e0f8b5c23f873665ea6b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6cc6ca2c104bbddc35e0f8b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 15:47:43 2009 +0200 kernel32: Compile .mc files to resources as independent files. --- Make.rules.in | 5 +++-- dlls/kernel32/Makefile.in | 6 +++--- dlls/kernel32/kernel.rc | 29 ----------------------------- 3 files changed, 6 insertions(+), 34 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 7f72099..2b83943 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -118,7 +118,8 @@ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl= CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:%=dlldata.c) \ $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) $(MC_SRCS:.mc=.mc.rc) -OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(RC_SRCS:.rc=.res) $(EXTRA_OBJS) +OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) \ + $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.mc.res) $(EXTRA_OBJS) LINTS = $(C_SRCS:.c=.ln) @@ -318,7 +319,7 @@ $(MC_SRCS:.mc=.mc.rc): $(WMC) $(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb): $(WIDL) -$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC) +$(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.mc.res) $(RC_SRCS16:.rc=.res): $(WRC) $(SUBDIRS): dummy @cd $@ && $(MAKE) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index d299df9..30fddb6 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -76,7 +76,9 @@ C_SRCS16 = \ registry16.c \ toolhelp16.c -RC_SRCS = kernel.rc +RC_SRCS = \ + locale_rc.rc \ + version.rc RC_SRCS16 = \ version16.rc @@ -95,8 +97,6 @@ EXTRASUBDIRS = nls @MAKE_DLL_RULES@ -kernel.res: $(MC_SRCS:.mc=.mc.rc) - relay16asm.o: $(WINEBUILD) $(WINEBUILD) $(WINEBUILDFLAGS) -o $@ --relay16 diff --git a/dlls/kernel32/kernel.rc b/dlls/kernel32/kernel.rc deleted file mode 100644 index 30d1dca..0000000 --- a/dlls/kernel32/kernel.rc +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2000 Dave Pickles - * - * 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 "locale_rc.rc" - -#include "nls/winerr_deu.mc.rc" -#include "nls/winerr_enu.mc.rc" -#include "nls/winerr_fra.mc.rc" -#include "nls/winerr_kor.mc.rc" -#include "nls/winerr_nld.mc.rc" -#include "nls/winerr_nor.mc.rc" -#include "nls/winerr_plk.mc.rc" - -#include "version.rc"

1 0

Alexander Nicolaysen Sørnes : regedit: Update Norwegian Bokmål translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 55b21c404a7f32748f260971a96fb3a788d822d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b21c404a7f32748f260971a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 3 02:07:41 2009 +0200 regedit: Update Norwegian Bokmål translation. --- programs/regedit/No.rc | 67 +++++++++++++++++++++++++----------------------- 1 files changed, 35 insertions(+), 32 deletions(-) diff --git a/programs/regedit/No.rc b/programs/regedit/No.rc index 7421a03..055252f 100644 --- a/programs/regedit/No.rc +++ b/programs/regedit/No.rc @@ -1,7 +1,7 @@ /* - * Regedit Norwegian Bokm�l resources + * Regedit Norwegian Bokmål resources * - * Copyright 2005-2008 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2009 Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,6 +20,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL /* @@ -46,10 +48,10 @@ BEGIN MENUITEM SEPARATOR POPUP "&Ny" BEGIN - MENUITEM "N�&kkel", ID_EDIT_NEW_KEY + MENUITEM "Nø&kkel", ID_EDIT_NEW_KEY MENUITEM SEPARATOR MENUITEM "&Strengverdi", ID_EDIT_NEW_STRINGVALUE - MENUITEM "&Bin�rverdi", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&Binærverdi", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD-verdi", ID_EDIT_NEW_DWORDVALUE MENUITEM "&Flerstrengverdi", ID_EDIT_NEW_MULTI_STRINGVALUE END @@ -57,7 +59,7 @@ BEGIN MENUITEM "&Slett\tDel", ID_EDIT_DELETE MENUITEM "&Gi nytt navn\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR - MENUITEM "&Kopier n�kkelnavn", ID_EDIT_COPYKEYNAME + MENUITEM "&Kopier nøkkelnavn", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Finn\tCtrl+F", ID_EDIT_FIND, GRAYED MENUITEM "Finn &neste\tF3", ID_EDIT_FINDNEXT, GRAYED @@ -88,7 +90,7 @@ BEGIN POPUP "" BEGIN MENUITEM "&Endre", ID_EDIT_MODIFY - MENUITEM "Endre bin�rdata", ID_EDIT_MODIFY_BIN + MENUITEM "Endre binærdata", ID_EDIT_MODIFY_BIN MENUITEM SEPARATOR MENUITEM "&Slett\tDel", ID_EDIT_DELETE MENUITEM "&Gi nytt navn", ID_EDIT_RENAME @@ -97,10 +99,10 @@ BEGIN BEGIN POPUP "&Ny" BEGIN - MENUITEM "N�&kkel", ID_EDIT_NEW_KEY + MENUITEM "Nø&kkel", ID_EDIT_NEW_KEY MENUITEM SEPARATOR MENUITEM "&Strengverdi", ID_EDIT_NEW_STRINGVALUE - MENUITEM "&Bin�rverdi", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&Binærverdi", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD-verdi", ID_EDIT_NEW_DWORDVALUE MENUITEM "&Flerstrengverdi", ID_EDIT_NEW_MULTI_STRINGVALUE END @@ -109,7 +111,7 @@ BEGIN MENUITEM "&Gi nytt navn\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR MENUITEM "&Eksporter...", ID_EDIT_EXPORT - MENUITEM "&Kopier n�kkelnavn", ID_EDIT_COPYKEYNAME + MENUITEM "&Kopier nøkkelnavn", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Finn\tCtrl+F", ID_EDIT_FIND, GRAYED END @@ -139,7 +141,7 @@ BEGIN LTEXT "Finn:",IDC_STATIC,5,7,119,8 EDITTEXT IDC_VALUE_NAME,40,5,125,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL LTEXT "Finn i:",IDC_STATIC,5, 22, 119, 8 -CHECKBOX "N�kler", IDC_FIND_KEYS, 5, 34, 90, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX +CHECKBOX "Nøkler", IDC_FIND_KEYS, 5, 34, 90, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX CHECKBOX "Verdinavn", IDC_FIND_VALUES, 5, 46, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX CHECKBOX "Verdiinnhold", IDC_FIND_CONTENT, 5, 58, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX CHECKBOX "Kun hele strenger", IDC_FIND_WHOLE, 5, 70, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX @@ -200,7 +202,7 @@ END IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 170, 100 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU -CAPTION "Rediger bin�r" +CAPTION "Rediger binær" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Verdinavn:",IDC_STATIC,5,5,119,8 @@ -242,29 +244,29 @@ END STRINGTABLE DISCARDABLE BEGIN - ID_REGISTRY_MENU "Inneholder kommandoer for � arbeide med hele registeret" - ID_EDIT_MENU "Inneholder kommandoer for � redigere verdier og n�kler" - ID_VIEW_MENU "Inneholder kommanoder for � tilpasse registervinduet" - ID_FAVORITES_MENU "Inneholder kommandoer for � f� tilgang til n�kler som brukes ofte" - ID_HELP_MENU "Inneholder kommandoer for � vise hjelp og informasjon om Registerredigering" - ID_EDIT_NEW_MENU "Inneholder kommandoer for � opprette nye n�kler eller verdier" + ID_REGISTRY_MENU "Inneholder kommandoer for å arbeide med hele registeret" + ID_EDIT_MENU "Inneholder kommandoer for å redigere verdier og nøkler" + ID_VIEW_MENU "Inneholder kommanoder for å tilpasse registervinduet" + ID_FAVORITES_MENU "Inneholder kommandoer for å få tilgang til nøkler som brukes ofte" + ID_HELP_MENU "Inneholder kommandoer for å vise hjelp og informasjon om Registerredigering" + ID_EDIT_NEW_MENU "Inneholder kommandoer for å opprette nye nøkler eller verdier" END STRINGTABLE DISCARDABLE BEGIN ID_EDIT_MODIFY "Endrer verdiens data" - ID_EDIT_NEW_KEY "Legger til en ny n�kkel" + ID_EDIT_NEW_KEY "Legger til en ny nøkkel" ID_EDIT_NEW_STRINGVALUE "Legger til en ny strengverdi" - ID_EDIT_NEW_BINARYVALUE "Legger til en ny bin�rverdis" + ID_EDIT_NEW_BINARYVALUE "Legger til en ny binærverdis" ID_EDIT_NEW_DWORDVALUE "Legger til en ny dobbeltord-verdi" ID_EDIT_NEW_MULTI_STRINGVALUE "Legger til en ny flerstrengverdi" ID_REGISTRY_IMPORTREGISTRYFILE "Importerer en tekstfil inn i registeret" ID_REGISTRY_EXPORTREGISTRYFILE "Eksporterer hele eller deler av registeret til en tekstfil" ID_REGISTRY_CONNECTNETWORKREGISTRY - "Kobler til registeret p� en annen maskin" + "Kobler til registeret på en annen maskin" ID_REGISTRY_DISCONNECTNETWORKREGISTRY - "Kobler fra registeret p� en annen maskin" + "Kobler fra registeret på en annen maskin" ID_REGISTRY_PRINT "Skriver ut hele eller deler av registeret" /* ID_HELP_HELPTOPICS "Viser hjelp til Registerredigering" */ ID_HELP_ABOUT "Viser programinformasjon, versjonnummer og kopirett" @@ -273,31 +275,32 @@ END STRINGTABLE DISCARDABLE BEGIN ID_REGISTRY_EXIT "Avslutter Registerredigering" - ID_FAVORITES_ADDTOFAVORITES "Legger n�kler til i favorittlisten" - ID_FAVORITES_REMOVEFAVORITE "Fjerner n�kler fra favorittlisten" + ID_FAVORITES_ADDTOFAVORITES "Legger nøkler til i favorittlisten" + ID_FAVORITES_REMOVEFAVORITE "Fjerner nøkler fra favorittlisten" ID_VIEW_STATUSBAR "Viser eller skjuler statuslinjens" ID_VIEW_SPLIT "Endrer posisjonen til delingslinjen mellom to ruter" ID_VIEW_REFRESH "Oppdaterer vinduet" ID_EDIT_DELETE "Sletter utvalget" ID_EDIT_RENAME "Gir nytt navn til utvalget" - ID_EDIT_COPYKEYNAME "Kopierer navnet til den valgte n�kkelen til utklippstavlen" - ID_EDIT_FIND "Finner en tekststreng i en n�kkel, verdi eller data" - ID_EDIT_FINDNEXT "Finner neste treff til teksten spesifisert i forrige s�k" + ID_EDIT_COPYKEYNAME "Kopierer navnet til den valgte nøkkelen til utklippstavlen" + ID_EDIT_FIND "Finner en tekststreng i en nøkkel, verdi eller data" + ID_EDIT_FINDNEXT "Finner neste treff til teksten spesifisert i forrige søk" + ID_EDIT_EXPORT "Eksporterer den valgte greinen av registeret til en tekstfil" END STRINGTABLE DISCARDABLE BEGIN IDS_ERROR "Feil" - IDS_BAD_KEY "Klarte ikke lese n�kkelen �%s�" - IDS_BAD_VALUE "Klarte ikke lese verdien �%s�" - IDS_UNSUPPORTED_TYPE "Kan ikke redigere n�kler av typen �%u�" + IDS_BAD_KEY "Klarte ikke lese nøkkelen «%s»" + IDS_BAD_VALUE "Klarte ikke lese verdien «%s»" + IDS_UNSUPPORTED_TYPE "Kan ikke redigere nøkler av typen «%u»" IDS_TOO_BIG_VALUE "Verdien er for stor (%u)" IDS_DELETE_BOX_TITLE "Bekreft sletting av verdi" - IDS_DELETE_BOX_TEXT "Virkelig slette verdien �%s�?" + IDS_DELETE_BOX_TEXT "Virkelig slette verdien «%s»?" IDS_DELETE_BOX_TEXT_MULTIPLE "Virkelig slette disse verdiene?" - IDS_NEWKEY "Ny n�kkel #%d" + IDS_NEWKEY "Ny nøkkel #%d" IDS_NEWVALUE "Ny verdi #%d" - IDS_NOTFOUND "Fant ikke s�kestrengen �%s�" + IDS_NOTFOUND "Fant ikke søkestrengen «%s»" END STRINGTABLE DISCARDABLE

1 0

Alexandre Julliard : ntdll: Fix the formatting of the get_token_groups request for 64-bit.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 2e2f6af0dec4075795709d906de06efa7c5e8975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e2f6af0dec4075795709d906… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 13:58:09 2009 +0200 ntdll: Fix the formatting of the get_token_groups request for 64-bit. --- dlls/ntdll/nt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 89d796d..c457028 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -321,7 +321,7 @@ NTSTATUS WINAPI NtQueryInformationToken( struct token_groups *tg = buffer; unsigned int *attr = (unsigned int *)(tg + 1); ULONG i; - const int non_sid_portion = (sizeof(struct token_groups) + tg->count * sizeof(unsigned long)); + const int non_sid_portion = (sizeof(struct token_groups) + tg->count * sizeof(unsigned int)); SID *sids = (SID *)((char *)tokeninfo + FIELD_OFFSET( TOKEN_GROUPS, Groups[tg->count] )); ULONG needed_bytes = FIELD_OFFSET( TOKEN_GROUPS, Groups[tg->count] ) + reply->user_len - non_sid_portion;

1 0

Alexandre Julliard : oleaut32: Replace long and unsigned long by more appropriate types.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 8fce9369b8609664a63b8d30a8b3791f93412ce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fce9369b8609664a63b8d30a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 13:48:54 2009 +0200 oleaut32: Replace long and unsigned long by more appropriate types. --- dlls/oleaut32/olefont.c | 4 ++-- dlls/oleaut32/typelib.c | 6 +++--- dlls/oleaut32/typelib2.c | 2 +- dlls/oleaut32/variant.c | 4 +++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 3e00844..a9b2c04 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -132,8 +132,8 @@ struct OLEFontImpl /* * Size ratio */ - long cyLogical; - long cyHimetric; + LONG cyLogical; + LONG cyHimetric; IConnectionPoint *pPropertyNotifyCP; IConnectionPoint *pFontEventsCP; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 10f5e23..1f104f8 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -938,7 +938,7 @@ typedef struct tagITypeLibImpl BSTR DocString; BSTR HelpFile; BSTR HelpStringDll; - unsigned long dwHelpContext; + DWORD dwHelpContext; int TypeInfoCount; /* nr of typeinfo's in librarry */ struct tagITypeInfoImpl *pTypeInfo; /* linked list of type info data */ int ctCustData; /* number of items in cust data list */ @@ -1058,8 +1058,8 @@ typedef struct tagITypeInfoImpl BSTR Name; BSTR DocString; BSTR DllName; - unsigned long dwHelpContext; - unsigned long dwHelpStringContext; + DWORD dwHelpContext; + DWORD dwHelpStringContext; /* functions */ TLBFuncDesc * funclist; /* linked list with function descriptions */ diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index b011342..0f641d4 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -760,7 +760,7 @@ static int ctl2_alloc_custdata( if (offset == -1) return offset; *((unsigned short *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset]) = VT_UI4; - *((unsigned long *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2]) = V_UI4(pVarVal); + *((unsigned int *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2]) = V_UI4(pVarVal); break; default: diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 7a5f325..e92a63d 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5571,7 +5571,9 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) V_VT(result) = VT_I8; V_I8(result) = V_I8(&lv) % V_I8(&rv); - TRACE("V_I8(left) == %ld, V_I8(right) == %ld, V_I8(result) == %ld\n", (long)V_I8(&lv), (long)V_I8(&rv), (long)V_I8(result)); + TRACE("V_I8(left) == %s, V_I8(right) == %s, V_I8(result) == %s\n", + wine_dbgstr_longlong(V_I8(&lv)), wine_dbgstr_longlong(V_I8(&rv)), + wine_dbgstr_longlong(V_I8(result))); /* convert left and right to the destination type */ rc = VariantChangeType(result, result, 0, resT);

1 0

Alexandre Julliard : rpcrt4: Replace long and unsigned long by more appropriate types.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 8de0242885a6cc49a6b98582aa3378b9c438c629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de0242885a6cc49a6b98582a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 13:42:57 2009 +0200 rpcrt4: Replace long and unsigned long by more appropriate types. --- dlls/rpcrt4/ndr_stubless.h | 2 +- dlls/rpcrt4/rpc_assoc.c | 4 +- dlls/rpcrt4/rpc_assoc.h | 2 +- dlls/rpcrt4/rpc_binding.c | 2 +- dlls/rpcrt4/rpc_defs.h | 18 ++++++++-------- dlls/rpcrt4/rpc_epmap.c | 16 +++++++------- dlls/rpcrt4/rpc_message.c | 49 +++++++++++++++++++++---------------------- dlls/rpcrt4/rpc_message.h | 14 ++++++------ 8 files changed, 53 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8de0242885a6cc49a6b98…

1 0

Alexander Nicolaysen Sørnes : appwiz.cpl : Update Norwegian Bokmål translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: fe3f19dc8265e2a2dc9a385057051b081b417632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3f19dc8265e2a2dc9a38505… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 3 01:58:35 2009 +0200 appwiz.cpl: Update Norwegian Bokmål translation. --- dlls/appwiz.cpl/No.rc | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/appwiz.cpl/No.rc b/dlls/appwiz.cpl/No.rc index 68fd133..889ee83 100644 --- a/dlls/appwiz.cpl/No.rc +++ b/dlls/appwiz.cpl/No.rc @@ -1,7 +1,7 @@ /* -* Add/Remove Programs Norwegian Bokm�l resources +* Add/Remove Programs Norwegian Bokmål resources * -* Copyright 2008 Alexander N. S�rnes <alex(a)thehandofagony.com> +* Copyright 2008-2009 Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,6 +21,9 @@ #include "res.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE @@ -29,12 +32,13 @@ STRINGTABLE IDS_CPL_DESC, "Lar deg installere ny programvare eller fjerne installerte programmer." IDS_TAB1_TITLE, "Programmer" - IDS_UNINSTALL_FAILED, "Klarte ikke kj�re avinstalleringsprogrammet, �%s�. Vil du fjerne oppf�ringen fra listen over installerte programmer?" + IDS_UNINSTALL_FAILED, "Klarte ikke kjøre avinstalleringsprogrammet, «%s». Vil du fjerne oppføringen fra listen over installerte programmer?" IDS_NOT_SPECIFIED, "Ikke oppgitt" IDS_COLUMN_NAME, "Navn" IDS_COLUMN_PUBLISHER, "Utgiver" IDS_COLUMN_VERSION, "Versjon" + IDS_INSTALL_FILTER, "Installasjonsprogrammer\0*instal*.exe;*setup*.exe;*.msi\0Programmer (*.exe)\0*.exe\0Alle filer (*.*)\0*.*\0\0" } IDD_MAIN DIALOG 0, 0, 320, 220 @@ -42,29 +46,29 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Installer/Avinstaller" FONT 8, "MS Shell Dlg" { - CONTROL "Trykk �Installer� for � installere et program fra en diskett, CD-stasjon eller annet medium.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "Trykk «Installer» for å installere et program fra en diskett, CD-stasjon eller annet medium.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 CONTROL "&Installer...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "F�lgende programmer kan fjernes automatisk. Merk et program og trykk �Legg til/Fjern� for � fjerne det eller endre installerte komponenter", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "Følgende programmer kan fjernes automatisk. Merk et program og trykk «Legg til/Fjern» for å fjerne det eller endre installerte komponenter", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "Legg til/Fje&rn...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 198, 64, 14 - CONTROL "&St�tteinformasjon...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 170, 198, 70, 14 + CONTROL "&Støtteinformasjon...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 170, 198, 70, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 } IDD_INFO DIALOG 0, 0, 256, 138 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "St�tteinformasjon" +CAPTION "Støtteinformasjon" FONT 8, "MS Shell Dlg" { CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 - CONTROL "F�lgende informasjon kan brukes til � f� teknisk st�tte for %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Følgende informasjon kan brukes til å få teknisk støtte for %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 CONTROL "Utgiver:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 CONTROL "Versjon:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 CONTROL "Kontakt:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 - CONTROL "St�tteinformasjon:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 - CONTROL "Kundest�tte, tlf:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Støtteinformasjon:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Kundestøtte, tlf:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 CONTROL "Lesmeg-fil:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 CONTROL "Produktoppdateringer:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 CONTROL "Kommentarer:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8

1 0

Piotr Caban : jscript: Fix strings allocation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: c001ffae2c68e7e47640f1a9a5895a16b44d08fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c001ffae2c68e7e47640f1a9a… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jul 3 02:45:32 2009 +0200 jscript: Fix strings allocation. --- dlls/jscript/date.c | 45 +++++++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index d20ee96..9dcc8a7 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -531,11 +531,13 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA GetLocaleInfoW(lcid_en, month_id, month, size); len += size-1; - year = year_from_time(time)/10; - while(year) { + year = year_from_time(time); + if(year<0) + year = -year+1; + do { year /= 10; len++; - } + } while(year); year = year_from_time(time); if(year<0) { @@ -544,11 +546,11 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA len += 5; } - day = date_from_time(time)/10; - while(day) { + day = date_from_time(time); + do { day /= 10; len++; - } + } while(day); day = date_from_time(time); offset = date->bias + @@ -733,11 +735,13 @@ static HRESULT Date_toUTCString(DispatchEx *dispex, LCID lcid, WORD flags, DISPP GetLocaleInfoW(lcid_en, month_id, month, size); len += size-1; - year = year_from_time(date->time)/10; - while(year) { + year = year_from_time(date->time); + if(year<0) + year = -year+1; + do { year /= 10; len++; - } + } while(year); year = year_from_time(date->time); if(year<0) { @@ -746,11 +750,11 @@ static HRESULT Date_toUTCString(DispatchEx *dispex, LCID lcid, WORD flags, DISPP len += 5; } - day = date_from_time(date->time)/10; - while(day) { + day = date_from_time(date->time); + do { day /= 10; len++; - } + } while(day); day = date_from_time(date->time); date_str = SysAllocStringLen(NULL, len); @@ -842,11 +846,13 @@ static HRESULT Date_toDateString(DispatchEx *dispex, LCID lcid, WORD flags, DISP GetLocaleInfoW(lcid_en, month_id, month, size); len += size-1; - year = year_from_time(time)/10; - while(year) { + year = year_from_time(time); + if(year<0) + year = -year+1; + do { year /= 10; len++; - } + } while(year); year = year_from_time(time); if(year<0) { @@ -855,11 +861,11 @@ static HRESULT Date_toDateString(DispatchEx *dispex, LCID lcid, WORD flags, DISP len += 5; } - day = date_from_time(time)/10; - while(day) { + day = date_from_time(time); + do { day /= 10; len++; - } + } while(day); day = date_from_time(time); date_str = SysAllocStringLen(NULL, len); @@ -2172,9 +2178,8 @@ static HRESULT create_date(script_ctx_t *ctx, BOOL use_constr, DOUBLE time, Disp DateInstance *date; HRESULT hres; TIME_ZONE_INFORMATION tzi; - DWORD dret; - dret = GetTimeZoneInformation(&tzi); + GetTimeZoneInformation(&tzi); date = heap_alloc_zero(sizeof(DateInstance)); if(!date)

1 0

Alexandre Julliard : ole32/tests: Fix the HMETAFILE_UserSize prototype.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 05beb0daed66a8791f2871aec1e71205ff771c11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05beb0daed66a8791f2871aec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 13:57:21 2009 +0200 ole32/tests: Fix the HMETAFILE_UserSize prototype. --- dlls/ole32/tests/usrmarshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index fde0034..a655397 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -29,7 +29,7 @@ #include "wine/test.h" -ULONG __RPC_USER HMETAFILE_UserSize(ULONG *, unsigned long, HMETAFILE *); +ULONG __RPC_USER HMETAFILE_UserSize(ULONG *, ULONG, HMETAFILE *); unsigned char * __RPC_USER HMETAFILE_UserMarshal(ULONG *, unsigned char *, HMETAFILE *); unsigned char * __RPC_USER HMETAFILE_UserUnmarshal(ULONG *, unsigned char *, HMETAFILE *); void __RPC_USER HMETAFILE_UserFree(ULONG *, HMETAFILE *);

1 0

Detlef Riekenberg : urlmon: Implement the ZoneEnumerator.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 9a7f221b130aa10c1d3639d40e63988419bed2b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a7f221b130aa10c1d3639d40… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jul 2 22:04:43 2009 +0200 urlmon: Implement the ZoneEnumerator. --- dlls/urlmon/sec_mgr.c | 158 +++++++++++++++++++++++++++++++++++++++++---- dlls/urlmon/urlmon_main.h | 5 ++ 2 files changed, 149 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 19286b1..47caf18 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -3,6 +3,7 @@ * * Copyright (c) 2004 Huw D M Davies * Copyright 2004 Jacek Caban + * Copyright 2009 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,6 +39,12 @@ static const WCHAR iconW[] = {'I','c','o','n',0}; static const WCHAR minlevelW[] = {'M','i','n','L','e','v','e','l',0}; static const WCHAR recommendedlevelW[] = {'R','e','c','o','m','m','e','n','d','e','d', 'L','e','v','e','l',0}; +static const WCHAR wszZonesKey[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s','\\', + 'Z','o','n','e','s','\\',0}; /******************************************************************** * get_string_from_reg [internal] @@ -205,13 +212,6 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) static HRESULT open_zone_key(HKEY parent_key, DWORD zone, HKEY *hkey) { - static const WCHAR wszZonesKey[] = - {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s','\\', - 'Z','o','n','e','s','\\',0}; static const WCHAR wszFormat[] = {'%','s','%','l','d',0}; WCHAR key_name[sizeof(wszZonesKey)/sizeof(WCHAR)+8]; @@ -673,8 +673,69 @@ HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) typedef struct { const IInternetZoneManagerVtbl* lpVtbl; LONG ref; + LPDWORD *zonemaps; + DWORD zonemap_count; } ZoneMgrImpl; + +/*********************************************************************** + * build_zonemap_from_reg [internal] + * + * Enumerate the Zones in the Registry and return the Zones in a DWORD-array + * The number of the Zones is returned in data[0] + */ +static LPDWORD build_zonemap_from_reg(void) +{ + WCHAR name[32]; + HKEY hkey; + LPDWORD data = NULL; + DWORD allocated = 6; /* space for the zonecount and Zone "0" upto Zone "4" */ + DWORD used = 0; + DWORD res; + DWORD len; + + + res = RegOpenKeyW(HKEY_CURRENT_USER, wszZonesKey, &hkey); + if (res) + return NULL; + + data = heap_alloc(allocated * sizeof(DWORD)); + if (!data) + goto cleanup; + + while (!res) { + name[0] = '\0'; + len = sizeof(name) / sizeof(name[0]); + res = RegEnumKeyExW(hkey, used, name, &len, NULL, NULL, NULL, NULL); + + if (!res) { + used++; + if (used == allocated) { + LPDWORD new_data; + + allocated *= 2; + new_data = heap_realloc_zero(data, allocated * sizeof(DWORD)); + if (!new_data) + goto cleanup; + + data = new_data; + } + data[used] = atoiW(name); + } + } + if (used) { + RegCloseKey(hkey); + data[0] = used; + return data; + } + +cleanup: + /* something failed */ + RegCloseKey(hkey); + heap_free(data); + return NULL; +} + /******************************************************************** * IInternetZoneManager_QueryInterface */ @@ -723,6 +784,8 @@ static ULONG WINAPI ZoneMgrImpl_Release(IInternetZoneManager* iface) TRACE("(%p)->(ref before=%u)\n",This, refCount + 1); if(!refCount) { + while (This->zonemap_count) heap_free(This->zonemaps[--This->zonemap_count]); + heap_free(This->zonemaps); heap_free(This); URLMON_UnlockModule(); } @@ -876,8 +939,51 @@ static HRESULT WINAPI ZoneMgrImpl_CreateZoneEnumerator(IInternetZoneManager* ifa DWORD* pdwCount, DWORD dwFlags) { - FIXME("(%p)->(%p %p %08x) stub\n", iface, pdwEnum, pdwCount, dwFlags); - return E_NOTIMPL; + ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + LPDWORD * new_maps; + LPDWORD data; + DWORD i; + + TRACE("(%p)->(%p, %p, 0x%08x)\n", This, pdwEnum, pdwCount, dwFlags); + if (!pdwEnum || !pdwCount || (dwFlags != 0)) + return E_INVALIDARG; + + data = build_zonemap_from_reg(); + TRACE("found %d zones\n", data ? data[0] : -1); + + if (!data) + return E_FAIL; + + for (i = 0; i < This->zonemap_count; i++) { + if (This->zonemaps && !This->zonemaps[i]) { + This->zonemaps[i] = data; + *pdwEnum = i; + *pdwCount = data[0]; + return S_OK; + } + } + + if (This->zonemaps) { + /* try to double the nr. of pointers in the array */ + new_maps = heap_realloc_zero(This->zonemaps, This->zonemap_count * 2 * sizeof(LPDWORD)); + if (new_maps) + This->zonemap_count *= 2; + } + else + { + This->zonemap_count = 2; + new_maps = heap_alloc_zero(This->zonemap_count * sizeof(LPDWORD)); + } + + if (!new_maps) { + heap_free(data); + return E_FAIL; + } + This->zonemaps = new_maps; + This->zonemaps[i] = data; + *pdwEnum = i; + *pdwCount = data[0]; + return S_OK; } /******************************************************************** @@ -888,8 +994,21 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAt(IInternetZoneManager* iface, DWORD dwIndex, DWORD* pdwZone) { - FIXME("(%p)->(%08x %08x %p) stub\n", iface, dwEnum, dwIndex, pdwZone); - return E_NOTIMPL; + ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + LPDWORD data; + + TRACE("(%p)->(0x%08x, %d, %p)\n", This, dwEnum, dwIndex, pdwZone); + + /* make sure, that dwEnum and dwIndex are in the valid range */ + if (dwEnum < This->zonemap_count) { + if ((data = This->zonemaps[dwEnum])) { + if (dwIndex < data[0]) { + *pdwZone = data[dwIndex + 1]; + return S_OK; + } + } + } + return E_INVALIDARG; } /******************************************************************** @@ -898,8 +1017,19 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAt(IInternetZoneManager* iface, static HRESULT WINAPI ZoneMgrImpl_DestroyZoneEnumerator(IInternetZoneManager* iface, DWORD dwEnum) { - FIXME("(%p)->(%08x) stub\n", iface, dwEnum); - return E_NOTIMPL; + ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + LPDWORD data; + + TRACE("(%p)->(0x%08x)\n", This, dwEnum); + /* make sure, that dwEnum is valid */ + if (dwEnum < This->zonemap_count) { + if ((data = This->zonemaps[dwEnum])) { + This->zonemaps[dwEnum] = NULL; + heap_free(data); + return S_OK; + } + } + return E_INVALIDARG; } /******************************************************************** @@ -937,7 +1067,7 @@ static const IInternetZoneManagerVtbl ZoneMgrImplVtbl = { HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) { - ZoneMgrImpl* ret = heap_alloc(sizeof(ZoneMgrImpl)); + ZoneMgrImpl* ret = heap_alloc_zero(sizeof(ZoneMgrImpl)); TRACE("(%p %p)\n", pUnkOuter, ppobj); ret->lpVtbl = &ZoneMgrImplVtbl; diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 1b5d8d5..62a7e91 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -151,6 +151,11 @@ static inline void *heap_realloc(void *mem, size_t len) return HeapReAlloc(GetProcessHeap(), 0, mem, len); } +static inline void *heap_realloc_zero(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); +} + static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem);

1 0

Detlef Riekenberg : urlmon/tests: Add tests for the ZoneEnumerator.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 694bf576d0d94fa1dfdb6a378655df3018f203f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=694bf576d0d94fa1dfdb6a378… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jul 2 22:08:14 2009 +0200 urlmon/tests: Add tests for the ZoneEnumerator. --- dlls/urlmon/tests/sec_mgr.c | 120 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 120 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 325e1db..e35cf48 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -1,5 +1,6 @@ /* * Copyright 2005-2006 Jacek Caban for CodeWeavers + * Copyright 2009 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -281,6 +282,74 @@ static void test_polices(void) IInternetZoneManager_Release(zonemgr); } +static void test_CreateZoneEnumerator(void) +{ + IInternetZoneManager *zonemgr = NULL; + HRESULT hr; + DWORD dwEnum; + DWORD dwEnum2; + DWORD dwCount; + DWORD dwCount2; + + hr = CoInternetCreateZoneManager(NULL, &zonemgr, 0); + ok(hr == S_OK, "CoInternetCreateZoneManager result: 0x%x\n", hr); + if (FAILED(hr)) + return; + + dwEnum=0xdeadbeef; + hr = IInternetZoneManager_CreateZoneEnumerator(zonemgr, &dwEnum, NULL, 0); + ok((hr == E_INVALIDARG) && (dwEnum == 0xdeadbeef), + "got 0x%x with 0x%x (expected E_INVALIDARG with 0xdeadbeef)\n", hr, dwEnum); + + dwCount=0xdeadbeef; + hr = IInternetZoneManager_CreateZoneEnumerator(zonemgr, NULL, &dwCount, 0); + ok((hr == E_INVALIDARG) && (dwCount == 0xdeadbeef), + "got 0x%x and 0x%x (expected E_INVALIDARG and 0xdeadbeef)\n", hr, dwCount); + + dwEnum=0xdeadbeef; + dwCount=0xdeadbeef; + hr = IInternetZoneManager_CreateZoneEnumerator(zonemgr, &dwEnum, &dwCount, 0xffffffff); + ok((hr == E_INVALIDARG) && (dwEnum == 0xdeadbeef) && (dwCount == 0xdeadbeef), + "got 0x%x with 0x%x and 0x%x (expected E_INVALIDARG with 0xdeadbeef and 0xdeadbeef)\n", + hr, dwEnum, dwCount); + + dwEnum=0xdeadbeef; + dwCount=0xdeadbeef; + hr = IInternetZoneManager_CreateZoneEnumerator(zonemgr, &dwEnum, &dwCount, 1); + ok((hr == E_INVALIDARG) && (dwEnum == 0xdeadbeef) && (dwCount == 0xdeadbeef), + "got 0x%x with 0x%x and 0x%x (expected E_INVALIDARG with 0xdeadbeef and 0xdeadbeef)\n", + hr, dwEnum, dwCount); + + dwEnum=0xdeadbeef; + dwCount=0xdeadbeef; + /* Normal use */ + hr = IInternetZoneManager_CreateZoneEnumerator(zonemgr, &dwEnum, &dwCount, 0); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + + if (SUCCEEDED(hr)) { + dwEnum2=0xdeadbeef; + dwCount2=0xdeadbeef; + hr = IInternetZoneManager_CreateZoneEnumerator(zonemgr, &dwEnum2, &dwCount2, 0); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + if (SUCCEEDED(hr)) { + /* native urlmon has an incrementing counter for dwEnum */ + hr = IInternetZoneManager_DestroyZoneEnumerator(zonemgr, dwEnum2); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + } + + hr = IInternetZoneManager_DestroyZoneEnumerator(zonemgr, dwEnum); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + + /* Destroy the Enumerator twice is detected and handled in native urlmon */ + hr = IInternetZoneManager_DestroyZoneEnumerator(zonemgr, dwEnum); + ok((hr == E_INVALIDARG), "got 0x%x (expected E_INVALIDARG)\n", hr); + } + + /* ::Release succeed also, when a ::DestroyZoneEnumerator is missing */ + hr = IInternetZoneManager_Release(zonemgr); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); +} + static void test_GetZoneActionPolicy(void) { IInternetZoneManager *zonemgr = NULL; @@ -321,6 +390,55 @@ static void test_GetZoneActionPolicy(void) IInternetZoneManager_Release(zonemgr); } +static void test_GetZoneAt(void) +{ + IInternetZoneManager *zonemgr = NULL; + HRESULT hr; + DWORD dwEnum; + DWORD dwCount; + DWORD dwZone; + DWORD i; + + hr = CoInternetCreateZoneManager(NULL, &zonemgr, 0); + ok(hr == S_OK, "CoInternetCreateZoneManager result: 0x%x\n", hr); + if (FAILED(hr)) + return; + + hr = IInternetZoneManager_CreateZoneEnumerator(zonemgr, &dwEnum, &dwCount, 0); + if (FAILED(hr)) + goto cleanup; + + if (0) { + /* this crashes with native urlmon */ + hr = IInternetZoneManager_GetZoneAt(zonemgr, dwEnum, 0, NULL); + } + + dwZone = 0xdeadbeef; + hr = IInternetZoneManager_GetZoneAt(zonemgr, 0xdeadbeef, 0, &dwZone); + ok(hr == E_INVALIDARG, + "got 0x%x with 0x%x (expected E_INVALIDARG)\n", hr, dwZone); + + for (i = 0; i < dwCount; i++) + { + dwZone = 0xdeadbeef; + hr = IInternetZoneManager_GetZoneAt(zonemgr, dwEnum, i, &dwZone); + ok(hr == S_OK, "#%d: got x%x with %d (expected S_OK)\n", i, hr, dwZone); + } + + dwZone = 0xdeadbeef; + /* MSDN (index .. must be .. less than or equal to) is wrong */ + hr = IInternetZoneManager_GetZoneAt(zonemgr, dwEnum, dwCount, &dwZone); + ok(hr == E_INVALIDARG, + "got 0x%x with 0x%x (expected E_INVALIDARG)\n", hr, dwZone); + + hr = IInternetZoneManager_DestroyZoneEnumerator(zonemgr, dwEnum); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + +cleanup: + hr = IInternetZoneManager_Release(zonemgr); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); +} + static void test_GetZoneAttributes(void) { IInternetZoneManager *zonemgr = NULL; @@ -382,7 +500,9 @@ START_TEST(sec_mgr) test_SecurityManager(); test_polices(); + test_CreateZoneEnumerator(); test_GetZoneActionPolicy(); + test_GetZoneAt(); test_GetZoneAttributes(); OleUninitialize();

1 0

Alexander Nicolaysen Sørnes : shell32: Update Norwegian Bokmål translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 49e0315e86b4d282a88bec803a3f19bea04f1d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e0315e86b4d282a88bec803… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 3 02:04:15 2009 +0200 shell32: Update Norwegian Bokmål translation. --- dlls/shell32/shell32_No.rc | 62 +++++++++++++++++++++++-------------------- 1 files changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/shell32/shell32_No.rc b/dlls/shell32/shell32_No.rc index 12ac088..634c733 100644 --- a/dlls/shell32/shell32_No.rc +++ b/dlls/shell32/shell32_No.rc @@ -1,5 +1,5 @@ /* - * Copyright 2005-2008 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2009 Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,12 +18,14 @@ #include "shresdef.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL MENU_001 MENU DISCARDABLE BEGIN MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON - MENUITEM "&Sm� ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Små ikoner", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW END @@ -38,7 +40,7 @@ BEGIN POPUP "&Vis" BEGIN MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON - MENUITEM "S&m� ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "S&må ikoner", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW END @@ -47,7 +49,7 @@ BEGIN BEGIN MENUITEM "Etter &navn", 0x30 /* column 0 */ MENUITEM "Etter &type", 0x32 /* column 2 */ - MENUITEM "Etter &st�rrelse", 0x31 /* ... */ + MENUITEM "Etter &størrelse", 0x31 /* ... */ MENUITEM "Etter &dato", 0x33 MENUITEM SEPARATOR MENUITEM "Ordne &automatisk", FCIDM_SHVIEW_AUTOARRANGE @@ -79,7 +81,7 @@ BEGIN BEGIN MENUITEM "&Velg" FCIDM_SHVIEW_OPEN MENUITEM "&Utforsk", FCIDM_SHVIEW_EXPLORE - MENUITEM "&�pne", FCIDM_SHVIEW_OPEN + MENUITEM "&Åpne", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR MENUITEM "Klipp &ut", FCIDM_SHVIEW_CUT MENUITEM "&Kopier", FCIDM_SHVIEW_COPY @@ -103,7 +105,7 @@ BEGIN POPUP "&Vis" BEGIN MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON - MENUITEM "&Sm� ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Små ikoner", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW END @@ -171,7 +173,7 @@ FONT 10, "MS Shell Dlg" ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 42, 10, 170, 10 LTEXT "", IDC_ABOUT_STATIC_TEXT2, 42, 22, 170, 10 - LTEXT "Kj�rer p� %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "Kjører på %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 LTEXT "Wine er laget av", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } @@ -181,8 +183,8 @@ CAPTION "" FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Skriv inn navnet p� programmet, mappen, dokumentet etter Internett-ressursen du �nsker � �pne.", 12289, 36, 11, 182, 18 - LTEXT "&�pne:", 12305, 7, 39, 24, 10 + LTEXT "Skriv inn navnet på programmet, mappen, dokumentet etter Internett-ressursen du ønsker å åpne.", 12289, 36, 11, 182, 18 + LTEXT "&Åpne:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Avbryt", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP @@ -193,11 +195,11 @@ STRINGTABLE { /* columns in the shellview */ IDS_SHV_COLUMN1 "Fil" - IDS_SHV_COLUMN2 "St�rrelse" + IDS_SHV_COLUMN2 "Størrelse" IDS_SHV_COLUMN3 "Type" IDS_SHV_COLUMN4 "Endret" IDS_SHV_COLUMN5 "Egenskaper" - IDS_SHV_COLUMN6 "St�rrelse" + IDS_SHV_COLUMN6 "Størrelse" IDS_SHV_COLUMN7 "Ledig plass" IDS_SHV_COLUMN8 "Navn" IDS_SHV_COLUMN9 "Kommentarer" @@ -214,23 +216,23 @@ STRINGTABLE /* context menus */ IDS_VIEW_LARGE "&Store ikoner" - IDS_VIEW_SMALL "S&m� ikoner" + IDS_VIEW_SMALL "S&må ikoner" IDS_VIEW_LIST "&Liste" IDS_VIEW_DETAILS "&Detaljer" IDS_SELECT "Velg" - IDS_OPEN "�pne" + IDS_OPEN "Åpne" IDS_CREATEFOLDER_DENIED "Kunne ikke opprette ny mappe: tilgang nektet." IDS_CREATEFOLDER_CAPTION "Klarte ikke opprette ny mappe" IDS_DELETEITEM_CAPTION "Bekreft filsletting" IDS_DELETEFOLDER_CAPTION "Bekreft sletting av mappe" - IDS_DELETEITEM_TEXT "Virkelig slette �%1�?" + IDS_DELETEITEM_TEXT "Virkelig slette «%1»?" IDS_DELETEMULTIPLE_TEXT "Virkelig slette disse %1 elementene?" IDS_DELETESELECTED_TEXT "Virkelig slette valgte element(er)??" - IDS_TRASHITEM_TEXT "Virkelig legge �%1� i papirkurven?" - IDS_TRASHFOLDER_TEXT "Virkelig legge �%1� og alt innholdet i papirkurven?" + IDS_TRASHITEM_TEXT "Virkelig legge «%1» i papirkurven?" + IDS_TRASHFOLDER_TEXT "Virkelig legge «%1» og alt innholdet i papirkurven?" IDS_TRASHMULTIPLE_TEXT "Virkelig legge disse %1 valgte elementene i papirkurven?" - IDS_CANTTRASH_TEXT "Elementet �%1� kan ikke legges i papirkurven. Vil du slette det i stedet?" + IDS_CANTTRASH_TEXT "Elementet «%1» kan ikke legges i papirkurven. Vil du slette det i stedet?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" IDS_OVERWRITEFILE_CAPTION "Bekreft overskriving av fil" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ @@ -239,13 +241,13 @@ STRINGTABLE "the folder?" /* message box strings */ - IDS_RESTART_TITLE "Starte p� nytt" + IDS_RESTART_TITLE "Starte på nytt" IDS_RESTART_PROMPT "Vil du simulere en omstart av Windows?" IDS_SHUTDOWN_TITLE "Avslutt" - IDS_SHUTDOWN_PROMPT "Vil du avslutte Wine-�kten?" + IDS_SHUTDOWN_PROMPT "Vil du avslutte Wine-økten?" /* Run File dialog */ - IDS_RUNDLG_ERROR "Klarte ikke vise Kj�r-vinduet (intern feil)" + IDS_RUNDLG_ERROR "Klarte ikke vise Kjør-vinduet (intern feil)" IDS_RUNDLG_BROWSE_ERROR "Klarte ikke vise Bla-vinduet (intern feil)" IDS_RUNDLG_BROWSE_CAPTION "Bla" IDS_RUNDLG_BROWSE_FILTER "Programfiler\0*.exe\0Alle filer\0*.*\0\0" @@ -273,7 +275,7 @@ STRINGTABLE IDS_MYPICTURES "Mine bilder" IDS_PROGRAM_FILES_COMMON "Programfiler\\Fellesfiler" IDS_COMMON_DOCUMENTS "Dokumenter" - IDS_ADMINTOOLS "Start-meny\\Programmer\\Administrative verkt�y" + IDS_ADMINTOOLS "Start-meny\\Programmer\\Administrative verktøy" IDS_COMMON_MUSIC "Dokumenter\\Min musikk" IDS_COMMON_PICTURES "Dokumenter\\Mine bilder" IDS_COMMON_VIDEO "Dokumenter\\Mine videoklipp" @@ -284,6 +286,8 @@ STRINGTABLE IDS_CPANEL_TITLE "Wine Kontrollpanel" IDS_CPANEL_NAME "Navn" IDS_CPANEL_DESCRIPTION "Beskrivelse" + + IDS_SHLEXEC_NOASSOC "Intet Windows-program er satt opp til å åpne denne filtypen." } STRINGTABLE @@ -291,14 +295,14 @@ STRINGTABLE IDS_LICENSE_CAPTION, "Lisensbetingelser" IDS_LICENSE, "Wine er fri programvare; du kan distribuere det og/eller \ -endre det i henhold til vilk�rene i �GNU Lesser General Public \ -License�, utgitt av the Free Software Foundation; enten \ -versjon 2.1 av Lisensen, eller (hvis du �nsker det) en nyere versjon.\n\n\ -Wine utgis i h�p om at det er nyttig, \ +endre det i henhold til vilkårene i «GNU Lesser General Public \ +License», utgitt av the Free Software Foundation; enten \ +versjon 2.1 av Lisensen, eller (hvis du ønsker det) en nyere versjon.\n\n\ +Wine utgis i håp om at det er nyttig, \ men UTEN ENHVER GARANTI; uten engang den antydede garantien om \ -HANDELSEGNETHET eller EGNETHET FOR ET SPESIELT FORM�L. Se �GNU \ -Lesser General Public License� for flere detaljer.\n\n\ -Du skal ha mottatt et eksemplar av �GNU Lesser General Public \ -License� sammen med dette programmet; hvis ikke, skriv til: the Free Software \ +HANDELSEGNETHET eller EGNETHET FOR ET SPESIELT FORMÅL. Se «GNU \ +Lesser General Public License» for flere detaljer.\n\n\ +Du skal ha mottatt et eksemplar av «GNU Lesser General Public \ +License» sammen med dette programmet; hvis ikke, skriv til: the Free Software \ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." }

1 0

Vincent Povirk : windowscodecs: Implement IsBlackWhite and IsGrayscale for palettes.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: cf8a26aff6b9f73f3184048b4b8beaafb8ec5f2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8a26aff6b9f73f3184048b4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 2 17:44:31 2009 -0500 windowscodecs: Implement IsBlackWhite and IsGrayscale for palettes. --- dlls/windowscodecs/palette.c | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index a3d67aa..ccf1176 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -186,14 +186,41 @@ static HRESULT WINAPI PaletteImpl_GetColors(IWICPalette *iface, UINT colorCount, static HRESULT WINAPI PaletteImpl_IsBlackWhite(IWICPalette *iface, BOOL *pfIsBlackWhite) { - FIXME("(%p,%p): stub\n", iface, pfIsBlackWhite); - return E_NOTIMPL; + PaletteImpl *This = (PaletteImpl*)iface; + + TRACE("(%p,%p)\n", iface, pfIsBlackWhite); + + if (!pfIsBlackWhite) return E_INVALIDARG; + + if (This->type == WICBitmapPaletteTypeFixedBW) + *pfIsBlackWhite = TRUE; + else + *pfIsBlackWhite = FALSE; + + return S_OK; } static HRESULT WINAPI PaletteImpl_IsGrayscale(IWICPalette *iface, BOOL *pfIsGrayscale) { - FIXME("(%p,%p): stub\n", iface, pfIsGrayscale); - return E_NOTIMPL; + PaletteImpl *This = (PaletteImpl*)iface; + + TRACE("(%p,%p)\n", iface, pfIsGrayscale); + + if (!pfIsGrayscale) return E_INVALIDARG; + + switch(This->type) + { + case WICBitmapPaletteTypeFixedBW: + case WICBitmapPaletteTypeFixedGray4: + case WICBitmapPaletteTypeFixedGray16: + case WICBitmapPaletteTypeFixedGray256: + *pfIsGrayscale = TRUE; + break; + default: + *pfIsGrayscale = FALSE; + } + + return S_OK; } static HRESULT WINAPI PaletteImpl_HasAlpha(IWICPalette *iface, BOOL *pfHasAlpha)

1 0

Vincent Povirk : windowscodecs: Implement InitializeCustom and GetColors for palettes.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 9f9b71c3ee0a5becef3510d3a6b2a4d11ce6eb73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9b71c3ee0a5becef3510d3a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 2 17:37:06 2009 -0500 windowscodecs: Implement InitializeCustom and GetColors for palettes. --- dlls/windowscodecs/palette.c | 49 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 42aa7f0..cacfd70 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -37,6 +37,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct { const IWICPaletteVtbl *lpIWICPaletteVtbl; LONG ref; + UINT count; + WICColor *colors; + WICBitmapPaletteType type; } PaletteImpl; static HRESULT WINAPI PaletteImpl_QueryInterface(IWICPalette *iface, REFIID iid, @@ -79,7 +82,10 @@ static ULONG WINAPI PaletteImpl_Release(IWICPalette *iface) TRACE("(%p) refcount=%u\n", iface, ref); if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This->colors); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -94,8 +100,29 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, static HRESULT WINAPI PaletteImpl_InitializeCustom(IWICPalette *iface, WICColor *pColors, UINT colorCount) { - FIXME("(%p,%p,%u): stub\n", iface, pColors, colorCount); - return E_NOTIMPL; + PaletteImpl *This = (PaletteImpl*)iface; + WICColor *new_colors; + + TRACE("(%p,%p,%u)\n", iface, pColors, colorCount); + + if (colorCount == 0) + { + new_colors = NULL; + } + else + { + if (!pColors) return E_INVALIDARG; + new_colors = HeapAlloc(GetProcessHeap(), 0, sizeof(WICColor) * colorCount); + if (!new_colors) return E_OUTOFMEMORY; + memcpy(new_colors, pColors, sizeof(WICColor) * colorCount); + } + + HeapFree(GetProcessHeap(), 0, This->colors); + This->colors = new_colors; + This->count = colorCount; + This->type = WICBitmapPaletteTypeCustom; + + return S_OK; } static HRESULT WINAPI PaletteImpl_InitializeFromBitmap(IWICPalette *iface, @@ -128,8 +155,19 @@ static HRESULT WINAPI PaletteImpl_GetColorCount(IWICPalette *iface, UINT *pcCoun static HRESULT WINAPI PaletteImpl_GetColors(IWICPalette *iface, UINT colorCount, WICColor *pColors, UINT *pcActualColors) { - FIXME("(%p,%i,%p,%p): stub\n", iface, colorCount, pColors, pcActualColors); - return E_NOTIMPL; + PaletteImpl *This = (PaletteImpl*)iface; + + TRACE("(%p,%i,%p,%p)\n", iface, colorCount, pColors, pcActualColors); + + if (!pColors || !pcActualColors) return E_INVALIDARG; + + if (This->count < colorCount) colorCount = This->count; + + memcpy(pColors, This->colors, sizeof(WICColor) * colorCount); + + *pcActualColors = colorCount; + + return S_OK; } static HRESULT WINAPI PaletteImpl_IsBlackWhite(IWICPalette *iface, BOOL *pfIsBlackWhite) @@ -175,6 +213,9 @@ HRESULT PaletteImpl_Create(IWICPalette **palette) This->lpIWICPaletteVtbl = &PaletteImpl_Vtbl; This->ref = 1; + This->count = 0; + This->colors = NULL; + This->type = WICBitmapPaletteTypeCustom; *palette = (IWICPalette*)This;

1 0

Vincent Povirk : windowscodecs: Add stub implementation of IWICPalette.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 4b9071b37ba272180de501d14db0cdd88a158b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9071b37ba272180de501d14… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 2 17:09:47 2009 -0500 windowscodecs: Add stub implementation of IWICPalette. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/imgfactory.c | 4 +- dlls/windowscodecs/palette.c | 182 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 2 + 4 files changed, 187 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 939a2bf..4de3b62 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ clsfactory.c \ imgfactory.c \ main.c \ + palette.c \ regsvr.c @MAKE_DLL_RULES@ diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 2edcdcd..b727d16 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -140,8 +140,8 @@ static HRESULT WINAPI ImagingFactory_CreateEncoder(IWICImagingFactory *iface, static HRESULT WINAPI ImagingFactory_CreatePalette(IWICImagingFactory *iface, IWICPalette **ppIPalette) { - FIXME("(%p,%p): stub\n", iface, ppIPalette); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIPalette); + return PaletteImpl_Create(ppIPalette); } static HRESULT WINAPI ImagingFactory_CreateFormatConverter(IWICImagingFactory *iface, diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c new file mode 100644 index 0000000..42aa7f0 --- /dev/null +++ b/dlls/windowscodecs/palette.c @@ -0,0 +1,182 @@ +/* + * Copyright 2009 Vincent Povirk for CodeWeavers + * + * 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 "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "objbase.h" +#include "wincodec.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +typedef struct { + const IWICPaletteVtbl *lpIWICPaletteVtbl; + LONG ref; +} PaletteImpl; + +static HRESULT WINAPI PaletteImpl_QueryInterface(IWICPalette *iface, REFIID iid, + void **ppv) +{ + PaletteImpl *This = (PaletteImpl*)iface; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICPalette, iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI PaletteImpl_AddRef(IWICPalette *iface) +{ + PaletteImpl *This = (PaletteImpl*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI PaletteImpl_Release(IWICPalette *iface) +{ + PaletteImpl *This = (PaletteImpl*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, + WICBitmapPaletteType ePaletteType, BOOL fAddTransparentColor) +{ + FIXME("(%p,%u,%i): stub\n", iface, ePaletteType, fAddTransparentColor); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_InitializeCustom(IWICPalette *iface, + WICColor *pColors, UINT colorCount) +{ + FIXME("(%p,%p,%u): stub\n", iface, pColors, colorCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_InitializeFromBitmap(IWICPalette *iface, + IWICBitmapSource *pISurface, UINT colorCount, BOOL fAddTransparentColor) +{ + FIXME("(%p,%p,%u,%i): stub\n", iface, pISurface, colorCount, fAddTransparentColor); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_InitializeFromPalette(IWICPalette *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_GetType(IWICPalette *iface, + WICBitmapPaletteType *pePaletteType) +{ + FIXME("(%p,%p): stub\n", iface, pePaletteType); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_GetColorCount(IWICPalette *iface, UINT *pcCount) +{ + FIXME("(%p,%p): stub\n", iface, pcCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_GetColors(IWICPalette *iface, UINT colorCount, + WICColor *pColors, UINT *pcActualColors) +{ + FIXME("(%p,%i,%p,%p): stub\n", iface, colorCount, pColors, pcActualColors); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_IsBlackWhite(IWICPalette *iface, BOOL *pfIsBlackWhite) +{ + FIXME("(%p,%p): stub\n", iface, pfIsBlackWhite); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_IsGrayscale(IWICPalette *iface, BOOL *pfIsGrayscale) +{ + FIXME("(%p,%p): stub\n", iface, pfIsGrayscale); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_HasAlpha(IWICPalette *iface, BOOL *pfHasAlpha) +{ + FIXME("(%p,%p): stub\n", iface, pfHasAlpha); + return E_NOTIMPL; +} + +static const IWICPaletteVtbl PaletteImpl_Vtbl = { + PaletteImpl_QueryInterface, + PaletteImpl_AddRef, + PaletteImpl_Release, + PaletteImpl_InitializePredefined, + PaletteImpl_InitializeCustom, + PaletteImpl_InitializeFromBitmap, + PaletteImpl_InitializeFromPalette, + PaletteImpl_GetType, + PaletteImpl_GetColorCount, + PaletteImpl_GetColors, + PaletteImpl_IsBlackWhite, + PaletteImpl_IsGrayscale, + PaletteImpl_HasAlpha +}; + +HRESULT PaletteImpl_Create(IWICPalette **palette) +{ + PaletteImpl *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(PaletteImpl)); + if (!This) return E_OUTOFMEMORY; + + This->lpIWICPaletteVtbl = &PaletteImpl_Vtbl; + This->ref = 1; + + *palette = (IWICPalette*)This; + + return S_OK; +} diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 313dca5..a6e09ff 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -22,6 +22,8 @@ extern HRESULT ImagingFactory_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); extern HRESULT BmpDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); +extern HRESULT PaletteImpl_Create(IWICPalette **palette); + extern HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, UINT srcwidth, UINT srcheight, INT srcstride, const WICRect *rc, UINT dststride, UINT dstbuffersize, BYTE *dstbuffer);

1 0