February 2012 - Wine-commits

Francois Gouget : po: Remove English strings and invalid translations from the Romanian translation .
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: e2b38c3ffd5f19c6bc4cbeb5a676d19e5740e47b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2b38c3ffd5f19c6bc4cbeb5a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 14 12:43:36 2012 +0100 po: Remove English strings and invalid translations from the Romanian translation. --- po/ro.po | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/po/ro.po b/po/ro.po index dbb8532..42ac763 100644 --- a/po/ro.po +++ b/po/ro.po @@ -3203,7 +3203,7 @@ msgstr "Pre&vizualizare imprimare" #: ieframe.rc:44 msgid "&Toolbars" -msgstr "&Despre Internet Explorer..." +msgstr "" #: ieframe.rc:46 msgid "&Standard bar" @@ -8112,23 +8112,19 @@ msgstr "Filmele mele" #, fuzzy msgctxt "directory" msgid "Desktop" -msgstr "" -"#-#-#-#-# ro.po (Wine) #-#-#-#-#\n" -"Desktop\n" -"#-#-#-#-# ro.po (Wine) #-#-#-#-#\n" -"Birou" +msgstr "Birou" #: shell32.rc:208 msgid "NetHood" -msgstr "NetHood" +msgstr "" #: shell32.rc:209 msgid "Templates" -msgstr "Templates" +msgstr "" #: shell32.rc:210 msgid "PrintHood" -msgstr "PrintHood" +msgstr "" #: shell32.rc:211 winhlp32.rc:45 msgid "History" @@ -8136,11 +8132,11 @@ msgstr "Istorie" #: shell32.rc:212 msgid "Program Files" -msgstr "Program Files" +msgstr "" #: shell32.rc:214 msgid "My Pictures" -msgstr "My Pictures" +msgstr "" #: shell32.rc:215 #, fuzzy @@ -8154,24 +8150,26 @@ msgstr "Documente" #: shell32.rc:217 #, fuzzy msgid "Administrative Tools" -msgstr "Meniu Start\\Programe\\Scule administrative" +msgstr "Scule administrative" #: shell32.rc:218 +#, fuzzy msgid "Music" -msgstr "Documente\\Muzica mea" +msgstr "Muzica mea" #: shell32.rc:219 +#, fuzzy msgid "Pictures" -msgstr "Documente\\Pozele mele" +msgstr "Pozele mele" #: shell32.rc:220 +#, fuzzy msgid "Videos" -msgstr "Documente\\Filmele mele" +msgstr "Filmele mele" #: shell32.rc:213 -#, fuzzy msgid "Program Files (x86)" -msgstr "Program Files" +msgstr "" #: shell32.rc:221 msgid "Contacts" @@ -13852,7 +13850,7 @@ msgstr "În&totdeauna deasupra" #: winhlp32.rc:56 msgid "&About Wine Help" -msgstr "&Informații..." +msgstr "" #: winhlp32.rc:64 msgid "Annotation..."

1 0

Alexandre Julliard : rpcrt4: Add ref counting to RPC connections, and grab a reference while processing an RPC packet.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: d2ca9f4b02079f669d44411c5e981fe6bf87dbee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ca9f4b02079f669d44411c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 14 16:19:32 2012 +0100 rpcrt4: Add ref counting to RPC connections, and grab a reference while processing an RPC packet. --- dlls/rpcrt4/rpc_assoc.c | 6 +++--- dlls/rpcrt4/rpc_binding.c | 2 +- dlls/rpcrt4/rpc_binding.h | 4 +++- dlls/rpcrt4/rpc_message.c | 2 +- dlls/rpcrt4/rpc_server.c | 7 ++++--- dlls/rpcrt4/rpc_transport.c | 17 +++++++++++++---- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index bcaa1c2..8cf2947 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -203,7 +203,7 @@ ULONG RpcAssoc_Release(RpcAssoc *assoc) LIST_FOR_EACH_ENTRY_SAFE(Connection, cursor2, &assoc->free_connection_pool, RpcConnection, conn_pool_entry) { list_remove(&Connection->conn_pool_entry); - RPCRT4_DestroyConnection(Connection); + RPCRT4_ReleaseConnection(Connection); } LIST_FOR_EACH_ENTRY_SAFE(context_handle, context_handle_cursor, &assoc->context_handle_list, RpcContextHandle, entry) @@ -410,14 +410,14 @@ RPC_STATUS RpcAssoc_GetClientConnection(RpcAssoc *assoc, status = RPCRT4_OpenClientConnection(NewConnection); if (status != RPC_S_OK) { - RPCRT4_DestroyConnection(NewConnection); + RPCRT4_ReleaseConnection(NewConnection); return status; } status = RpcAssoc_BindConnection(assoc, NewConnection, InterfaceId, TransferSyntax); if (status != RPC_S_OK) { - RPCRT4_DestroyConnection(NewConnection); + RPCRT4_ReleaseConnection(NewConnection); return status; } diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 685b569..11956e3 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -298,7 +298,7 @@ RPC_STATUS RPCRT4_CloseBinding(RpcBinding* Binding, RpcConnection* Connection) /* don't destroy a connection that is cached in the binding */ if (Binding->FromConn == Connection) return RPC_S_OK; - return RPCRT4_DestroyConnection(Connection); + return RPCRT4_ReleaseConnection(Connection); } else { RpcAssoc_ReleaseIdleConnection(Binding->Assoc, Connection); diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 7d49074..21c962d 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -61,6 +61,7 @@ struct connection_ops; typedef struct _RpcConnection { + LONG ref; BOOL server; LPSTR NetworkAddr; LPSTR Endpoint; @@ -153,7 +154,8 @@ ULONG RpcQualityOfService_Release(RpcQualityOfService *qos) DECLSPEC_HIDDEN; BOOL RpcQualityOfService_IsEqual(const RpcQualityOfService *qos1, const RpcQualityOfService *qos2) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS) DECLSPEC_HIDDEN; -RPC_STATUS RPCRT4_DestroyConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; +RpcConnection *RPCRT4_GrabConnection( RpcConnection *conn ) DECLSPEC_HIDDEN; +RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_OpenClientConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 1d18627..189f6c4 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -1875,7 +1875,7 @@ RPC_STATUS WINAPI I_RpcReceive(PRPC_MESSAGE pMsg) fail: RPCRT4_FreeHeader(hdr); - RPCRT4_DestroyConnection(conn); + RPCRT4_ReleaseConnection(conn); pMsg->ReservedForRuntime = NULL; return status; } diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 9121280..6fd1a7b 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -539,6 +539,7 @@ static DWORD CALLBACK RPCRT4_worker_thread(LPVOID the_arg) RpcPacket *pkt = the_arg; RPCRT4_process_packet(pkt->conn, pkt->hdr, pkt->msg, pkt->auth_data, pkt->auth_length); + RPCRT4_ReleaseConnection(pkt->conn); HeapFree(GetProcessHeap(), 0, pkt); return 0; } @@ -585,7 +586,7 @@ static DWORD CALLBACK RPCRT4_io_thread(LPVOID the_arg) HeapFree(GetProcessHeap(), 0, auth_data); goto exit; } - packet->conn = conn; + packet->conn = RPCRT4_GrabConnection( conn ); packet->hdr = hdr; packet->msg = msg; packet->auth_data = auth_data; @@ -621,7 +622,7 @@ static DWORD CALLBACK RPCRT4_io_thread(LPVOID the_arg) } } exit: - RPCRT4_DestroyConnection(conn); + RPCRT4_ReleaseConnection(conn); return 0; } @@ -631,7 +632,7 @@ void RPCRT4_new_client(RpcConnection* conn) if (!thread) { DWORD err = GetLastError(); ERR("failed to create thread, error=%08x\n", err); - RPCRT4_DestroyConnection(conn); + RPCRT4_ReleaseConnection(conn); } /* we could set conn->thread, but then we'd have to make the io_thread wait * for that, otherwise the thread might finish, destroy the connection, and diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 6568683..f873f71 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1374,7 +1374,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr if (ret < 0) { WARN("listen failed: %s\n", strerror(errno)); - RPCRT4_DestroyConnection(&tcpc->common); + RPCRT4_ReleaseConnection(&tcpc->common); status = RPC_S_OUT_OF_RESOURCES; continue; } @@ -1387,7 +1387,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr if (ret < 0) { WARN("couldn't make socket non-blocking, error %d\n", ret); - RPCRT4_DestroyConnection(&tcpc->common); + RPCRT4_ReleaseConnection(&tcpc->common); status = RPC_S_OUT_OF_RESOURCES; continue; } @@ -2946,6 +2946,7 @@ RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, } NewConnection = ops->alloc(); + NewConnection->ref = 1; NewConnection->Next = NULL; NewConnection->server_binding = NULL; NewConnection->server = server; @@ -2991,9 +2992,17 @@ static RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnecti return err; } -RPC_STATUS RPCRT4_DestroyConnection(RpcConnection* Connection) +RpcConnection *RPCRT4_GrabConnection( RpcConnection *conn ) { - TRACE("connection: %p\n", Connection); + InterlockedIncrement( &conn->ref ); + return conn; +} + +RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection* Connection) +{ + if (InterlockedDecrement( &Connection->ref ) > 0) return RPC_S_OK; + + TRACE("destroying connection %p\n", Connection); RPCRT4_CloseConnection(Connection); RPCRT4_strfree(Connection->Endpoint);

1 0

Dan Kegel : ntdll: Fix endianness of three fields in DVD_LAYER_DESCRIPTOR.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 6077b623f299861732d1f2ea1f3ab5af09d03adf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6077b623f299861732d1f2ea1… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Feb 13 10:51:18 2012 -0800 ntdll: Fix endianness of three fields in DVD_LAYER_DESCRIPTOR. --- dlls/ntdll/cdrom.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 802782b..1cd511c 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -144,6 +144,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(cdrom); # define CD_FRAMES 75 /* frames per second */ #endif +#ifdef WORDS_BIGENDIAN +#define GET_BE_DWORD(x) (x) +#else +#define GET_BE_DWORD(x) RtlUlongByteSwap(x) +#endif + static const struct iocodexs { DWORD code; @@ -2568,9 +2574,9 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, p->Reserved1 = 0; p->TrackDensity = l->track_density; p->LinearDensity = l->linear_density; - p->StartingDataSector = l->start_sector; - p->EndDataSector = l->end_sector; - p->EndLayerZeroSector = l->end_sector_l0; + p->StartingDataSector = GET_BE_DWORD(l->start_sector); + p->EndDataSector = GET_BE_DWORD(l->end_sector); + p->EndLayerZeroSector = GET_BE_DWORD(l->end_sector_l0); p->Reserved5 = 0; p->BCAFlag = l->bca; p->Reserved6 = 0; @@ -2693,9 +2699,9 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, nt_desc.xlayer->TrackDensity = desc.phys.trackDensity; nt_desc.xlayer->LinearDensity = desc.phys.linearDensity; nt_desc.xlayer->BCAFlag = desc.phys.bcaFlag; - nt_desc.xlayer->StartingDataSector = OSReadBigInt32(&desc.phys.zero1, 0); - nt_desc.xlayer->EndDataSector = OSReadBigInt32(&desc.phys.zero2, 0); - nt_desc.xlayer->EndLayerZeroSector = OSReadBigInt32(&desc.phys.zero3, 0); + nt_desc.xlayer->StartingDataSector = *(DWORD *)&desc.phys.zero1; + nt_desc.xlayer->EndDataSector = *(DWORD *)&desc.phys.zero2; + nt_desc.xlayer->EndLayerZeroSector = *(DWORD *)&desc.phys.zero3; nt_desc.xlayer->Reserved5 = 0; nt_desc.xlayer->Reserved6 = 0; break;

1 0

Charles Davis : ntdll: Zero reserved fields of the request structure in DVD_ReadDescriptor().
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 454467dc932b6a541daec3e6d4f5547652e9d03b URL: http://source.winehq.org/git/wine.git/?a=commit;h=454467dc932b6a541daec3e6d… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Mon Feb 13 17:06:36 2012 -0700 ntdll: Zero reserved fields of the request structure in DVD_ReadDescriptor(). --- dlls/ntdll/cdrom.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 1cd511c..1d1aa63 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -2640,6 +2640,7 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, } nt_desc; nt_desc.layer = layer; + RtlZeroMemory(&dvdrs, sizeof(dvdrs)); dvdrs.address = (uint32_t)(structure->BlockByteOffset.QuadPart>>11); dvdrs.grantID = (uint8_t)structure->SessionId; dvdrs.layer = structure->LayerNumber;

1 0

Johan Gill : advapi32: CryptCreateHash actually sets ERROR_INVALID_PARAMETER if the CSP handle is 0 .
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 16dc83578a97eb68c739d8ee8fb7611b3b4fe3b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16dc83578a97eb68c739d8ee8… Author: Johan Gill <johan.gill(a)gmail.com> Date: Tue Feb 14 12:15:04 2012 +0100 advapi32: CryptCreateHash actually sets ERROR_INVALID_PARAMETER if the CSP handle is 0. --- dlls/advapi32/crypt.c | 7 +------ dlls/advapi32/tests/crypt.c | 3 +++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 31260a8..5f44728 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -720,12 +720,7 @@ BOOL WINAPI CryptCreateHash (HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey, TRACE("(0x%lx, 0x%x, 0x%lx, %08x, %p)\n", hProv, Algid, hKey, dwFlags, phHash); - if (!prov) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!phHash || prov->dwMagic != MAGIC_CRYPTPROV || + if (!prov || !phHash || prov->dwMagic != MAGIC_CRYPTPROV || (key && key->dwMagic != MAGIC_CRYPTKEY)) { SetLastError(ERROR_INVALID_PARAMETER); diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index dae7263..7abf90b 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -238,6 +238,9 @@ static void test_incorrect_api_usage(void) if (!result) return; pCryptDestroyHash(hHash); + result = pCryptCreateHash(0, CALG_SHA, 0, 0, &hHash); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + result = pCryptGenKey(0, CALG_RC4, 0, &hKey); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());

1 0

Andrew Eikum : dsound: Add some more DSCAPS flags.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 9d06d41e37e124a95f095ecb4a61a44cb545fc60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d06d41e37e124a95f095ecb4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 14 09:40:38 2012 -0600 dsound: Add some more DSCAPS flags. --- dlls/dsound/dsound.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 305bfeb0..444b933 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1480,6 +1480,11 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG DSOUND_check_supported(device->client, 96000, 16, 2)) device->drvcaps.dwFlags |= DSCAPS_PRIMARY16BIT | DSCAPS_PRIMARYSTEREO; + /* the dsound mixer supports all of the following */ + device->drvcaps.dwFlags |= DSCAPS_SECONDARY8BIT | DSCAPS_SECONDARY16BIT; + device->drvcaps.dwFlags |= DSCAPS_SECONDARYMONO | DSCAPS_SECONDARYSTEREO; + device->drvcaps.dwFlags |= DSCAPS_CONTINUOUSRATE; + device->drvcaps.dwPrimaryBuffers = 1; device->drvcaps.dwMinSecondarySampleRate = DSBFREQUENCY_MIN; device->drvcaps.dwMaxSecondarySampleRate = DSBFREQUENCY_MAX;

1 0

Christian Costa : d3dxof: Enable dumping of input x files and templates.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 8bbf1344c9f5c3f8a40e87e1e2c050ba314a5d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bbf1344c9f5c3f8a40e87e1e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Feb 13 22:12:29 2012 +0100 d3dxof: Enable dumping of input x files and templates. --- dlls/d3dxof/d3dxof.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 38882a8..966baa2 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -32,6 +32,7 @@ #include <stdio.h> WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); +WINE_DECLARE_DEBUG_CHANNEL(d3dxof_dump); static const struct IDirectXFileVtbl IDirectXFile_Vtbl; static const struct IDirectXFileBinaryVtbl IDirectXFileBinary_Vtbl; @@ -215,6 +216,21 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV TRACE("File size is %d bytes\n", file_size); + if (TRACE_ON(d3dxof_dump)) + { + static USHORT num; + char tmp[12]; + HANDLE file; + sprintf(tmp, "file%05u.x", num++); + + file = CreateFileA(tmp, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, NULL); + if (file != INVALID_HANDLE_VALUE) + { + WriteFile(file, file_buffer, file_size, NULL, NULL); + CloseHandle(file); + } + } + object->pDirectXFile = This; object->buf.pdxf = This; @@ -284,6 +300,21 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP if (!pvData) return DXFILEERR_BADVALUE; + if (TRACE_ON(d3dxof_dump)) + { + static USHORT num; + char tmp[16]; + HANDLE file; + sprintf(tmp, "template%05u.x", num++); + + file = CreateFileA(tmp, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, NULL); + if (file != INVALID_HANDLE_VALUE) + { + WriteFile(file, pvData, cbSize, NULL, NULL); + CloseHandle(file); + } + } + hr = parse_header(&buf, &decomp_buffer); if (FAILED(hr)) goto cleanup;

1 0

Aric Stewart : gdi32: Rebuild the internal SystemLink every time.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 05a9d4ce94275fae1cf20a58b6745bc9a66b9358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a9d4ce94275fae1cf20a58b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Feb 13 10:45:27 2012 -0600 gdi32: Rebuild the internal SystemLink every time. --- dlls/gdi32/freetype.c | 418 ++++++++++++++++++++----------------------------- 1 files changed, 168 insertions(+), 250 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05a9d4ce94275fae1cf20…

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 5b3082a6d909dfe2a939fdeb0f82d867700d1684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b3082a6d909dfe2a939fdeb0… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Feb 14 23:38:16 2012 +0900 po: Update Japanese translation. --- po/ja.po | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/po/ja.po b/po/ja.po index 34ce0ac..c5a4ce8 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-02-03 00:55+0900\n" +"PO-Revision-Date: 2012-02-14 23:30+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: none\n" "Language: Japanese\n" @@ -9558,7 +9558,6 @@ msgstr "" "から呼ばれたときには何も起こりません。\n" #: cmd.rc:176 -#, fuzzy msgid "" "Start a program, or open a document in the program normally used for files " "with that suffix.\n" @@ -9577,11 +9576,11 @@ msgid "" "/L Show end-user license.\n" "/? Display this help and exit.\n" msgstr "" -"プログラムを開始したり、拡張子に基づき通常使われるプログラムで文書を開きま" -"す。\n" +"プログラムを開始するか、そのファイル拡張子で通常使われるプログラムで文書を開" +"きます。\n" "使い方:\n" -"start [options] プログラムファイル名 [...]\n" -"start [options] 文書ファイル名\n" +"start [オプション] プログラムファイル名 [...]\n" +"start [オプション] 文書ファイル名\n" "\n" "オプション:\n" "/M[inimized] プログラムを最小化した状態で開始します。\n" @@ -9594,11 +9593,6 @@ msgstr "" "/ProgIDOpen 直後に指定した progID を利用して文書を開きます。\n" "/L エンドユーザライセンスを表示します。\n" "/? このヘルプを表示し、終了します。\n" -"\n" -"start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" -"Start は完全に無保証です。詳細は /L オプションをつけて起動してください。\n" -"これはフリーソフトウェアです。一定の条件下で自由に再配布できます。\n" -"条件の詳細は 'start /L' を起動してください。\n" #: cmd.rc:201 msgid "TIME sets or shows the current system time.\n" @@ -9749,7 +9743,6 @@ msgstr "" "ます。\n" #: cmd.rc:305 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -9818,6 +9811,7 @@ msgstr "" "RD (RMDIR)\tサブディレクトリを削除\n" "SET\t\t環境変数を設定または表示\n" "SETLOCAL\tバッチファイルでの環境変更の局所化を開始\n" +"START\t\tプログラムを開始、または関連付けたプログラムで文書を開く\n" "TIME\t\tシステムの時刻を設定または表示\n" "TITLE\t\tCMDセッションのウィンドウタイトルを設定\n" "TYPE\t\tテキストファイルの内容を出力\n"

1 0

Akihiro Sagawa : comdlg32: Apply 3D effects to sample text area.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 0352a7089cfbea4ef68da89e2616a62e0920f2be URL: http://source.winehq.org/git/wine.git/?a=commit;h=0352a7089cfbea4ef68da89e2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Feb 14 23:38:14 2012 +0900 comdlg32: Apply 3D effects to sample text area. --- dlls/comdlg32/comdlg32.rc | 2 +- dlls/comdlg32/fontdlg.c | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index d1f95b5..13c544a 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -264,7 +264,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Sample",grp2,98,72,120,36,WS_GROUP - CTEXT "",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 8068e82..c081e91 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -1115,7 +1115,6 @@ static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSE { PAINTSTRUCT ps; HDC hdc; - HPEN hOrigPen; HFONT hOrigFont; LOGFONTW lf = *(lpcf->lpLogFont); @@ -1127,22 +1126,9 @@ static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSE ps.rcPaint.right, ps.rcPaint.bottom); /* Paint frame */ - MoveToEx( hdc, info.rcWindow.left, info.rcWindow.bottom, NULL ); - hOrigPen=SelectObject( hdc, CreatePen( PS_SOLID, 2, - GetSysColor( COLOR_3DSHADOW ) )); - LineTo( hdc, info.rcWindow.left, info.rcWindow.top ); - LineTo( hdc, info.rcWindow.right, info.rcWindow.top ); - DeleteObject(SelectObject( hdc, CreatePen( PS_SOLID, 2, - GetSysColor( COLOR_3DLIGHT ) ))); - LineTo( hdc, info.rcWindow.right, info.rcWindow.bottom ); - LineTo( hdc, info.rcWindow.left, info.rcWindow.bottom ); - DeleteObject(SelectObject( hdc, hOrigPen )); + DrawEdge( hdc, &info.rcWindow, EDGE_SUNKEN, BF_RECT|BF_ADJUST ); /* Draw the sample text itself */ - info.rcWindow.right--; - info.rcWindow.bottom--; - info.rcWindow.top++; - info.rcWindow.left++; hOrigFont = SelectObject( hdc, CreateFontIndirectW( &lf ) ); SetTextColor( hdc, lpcf->rgbColors );

1 0