April 2009 - Wine-commits - list.winehq.org

André Hentschel : winemaker: Remove unused function.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: e8a5325196cf570011df81d66d6c7d7a907f2492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8a5325196cf570011df81d66… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 22 18:37:00 2009 +0200 winemaker: Remove unused function. --- tools/winemaker | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 43efecc..ed9c5e5 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -397,28 +397,6 @@ sub is_absolute($) } ## -# Performs a binary search looking for the specified item -sub bsearch($$) -{ - my $array=$_[0]; - my $item=$_[1]; - my $last=@{$array}-1; - my $first=0; - - while ($first<=$last) { - my $index=int(($first+$last)/2); - my $cmp=@$array[$index] cmp $item; - if ($cmp<0) { - $first=$index+1; - } elsif ($cmp>0) { - $last=$index-1; - } else { - return $index; - } - } -} - -## # Retrieves the contents of the specified directory. # We either get it from the directories hashtable which acts as a # cache, or use opendir, readdir, closedir and store the result

1 0

Aric Stewart : msctf: Make use of generated cookies in sinks to allow 64 bit compatibility.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: d7c154a8db0d743340eb210a8715eb2b8dfed8b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7c154a8db0d743340eb210a8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 22 11:14:19 2009 -0500 msctf: Make use of generated cookies in sinks to allow 64 bit compatibility. --- dlls/msctf/context.c | 12 ++++++++++-- dlls/msctf/msctf_internal.h | 4 ++++ dlls/msctf/threadmgr.c | 12 ++++++++++-- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 2fc651f..38d8ad6 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -382,7 +382,7 @@ static WINAPI HRESULT ContextSource_AdviseSink(ITfSource *iface, return CONNECT_E_CANNOTCONNECT; } list_add_head(&This->pTextEditSink ,&es->entry); - *pdwCookie = (DWORD)es; + *pdwCookie = generate_Cookie(COOKIE_MAGIC_CONTEXTSINK, es); } else { @@ -396,10 +396,18 @@ static WINAPI HRESULT ContextSource_AdviseSink(ITfSource *iface, static WINAPI HRESULT ContextSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { - ContextSink *sink = (ContextSink*)pdwCookie; + ContextSink *sink; Context *This = impl_from_ITfSourceVtbl(iface); + TRACE("(%p) %x\n",This,pdwCookie); + if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_CONTEXTSINK) + return E_INVALIDARG; + + sink = (ContextSink*)remove_Cookie(pdwCookie); + if (!sink) + return CONNECT_E_NOCONNECTION; + list_remove(&sink->entry); free_sink(sink); diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 06499f1..a9f7982 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -20,6 +20,10 @@ #ifndef __WINE_MSCTF_I_H #define __WINE_MSCTF_I_H + +#define COOKIE_MAGIC_TMSINK 0x0010 +#define COOKIE_MAGIC_CONTEXTSINK 0x0020 + extern DWORD tlsIndex; extern HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index a73beee..f6f9be4 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -365,7 +365,7 @@ static WINAPI HRESULT ThreadMgrSource_AdviseSink(ITfSource *iface, return CONNECT_E_CANNOTCONNECT; } list_add_head(&This->ThreadMgrEventSink,&tms->entry); - *pdwCookie = (DWORD)tms; + *pdwCookie = generate_Cookie(COOKIE_MAGIC_TMSINK, tms); } else { @@ -380,10 +380,18 @@ static WINAPI HRESULT ThreadMgrSource_AdviseSink(ITfSource *iface, static WINAPI HRESULT ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { - ThreadMgrSink *sink = (ThreadMgrSink*)pdwCookie; + ThreadMgrSink *sink; ThreadMgr *This = impl_from_ITfSourceVtbl(iface); + TRACE("(%p) %x\n",This,pdwCookie); + if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_TMSINK) + return E_INVALIDARG; + + sink = (ThreadMgrSink*)remove_Cookie(pdwCookie); + if (!sink) + return CONNECT_E_NOCONNECTION; + list_remove(&sink->entry); free_sink(sink);

1 0

Hans Leidekker : kernel32: Improve GetVolumePathName stub.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 9b9d8dc3e89f17b88bcc62e51b111475361e5940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b9d8dc3e89f17b88bcc62e51… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 22 12:47:06 2009 +0200 kernel32: Improve GetVolumePathName stub. --- dlls/kernel32/volume.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 9addeab..31490b9 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1406,9 +1406,19 @@ BOOL WINAPI GetDiskFreeSpaceA( LPCSTR root, LPDWORD cluster_sectors, */ BOOL WINAPI GetVolumePathNameA(LPCSTR filename, LPSTR volumepathname, DWORD buflen) { + BOOL ret; + WCHAR *filenameW = NULL, *volumeW; + FIXME("(%s, %p, %d), stub!\n", debugstr_a(filename), volumepathname, buflen); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + + if (filename && !(filenameW = FILE_name_AtoW( filename, FALSE ))) return FALSE; + if (!(volumeW = HeapAlloc( GetProcessHeap(), 0, buflen * sizeof(WCHAR) ))) return FALSE; + + if ((ret = GetVolumePathNameW( filenameW, volumeW, buflen ))) + FILE_name_WtoA( volumeW, -1, volumepathname, buflen ); + + HeapFree( GetProcessHeap(), 0, volumeW ); + return ret; } /*********************************************************************** @@ -1416,8 +1426,18 @@ BOOL WINAPI GetVolumePathNameA(LPCSTR filename, LPSTR volumepathname, DWORD bufl */ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD buflen) { + const WCHAR *p = filename; + FIXME("(%s, %p, %d), stub!\n", debugstr_w(filename), volumepathname, buflen); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + if (p && tolowerW(p[0]) >= 'a' && tolowerW(p[0]) <= 'z' && p[1] ==':' && p[2] == '\\' && buflen >= 4) + { + volumepathname[0] = p[0]; + volumepathname[1] = ':'; + volumepathname[2] = '\\'; + volumepathname[3] = 0; + return TRUE; + } return FALSE; }

1 0

Łukasz Wojniłowicz : cmd: Updated Polish translations.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 7448a092588c5437d134297c1184664b0368aef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7448a092588c5437d134297c1… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Wed Apr 22 09:12:53 2009 +0200 cmd: Updated Polish translations. --- programs/cmd/Pl.rc | 93 ++++++++++++++++++++++++++------------------------- 1 files changed, 47 insertions(+), 46 deletions(-) diff --git a/programs/cmd/Pl.rc b/programs/cmd/Pl.rc index 7951843..74e852e 100644 --- a/programs/cmd/Pl.rc +++ b/programs/cmd/Pl.rc @@ -4,6 +4,7 @@ * * Copyright (C) 1999 D A Pickles * Copyright (C) 2004 Piotr Caban + * Copyright (C) 2009 �ukasz Wojni�owicz * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,19 +35,19 @@ wywo Zmiany domy�lnego katalogu, zmiennych �rodowiskowych itd. wykonane przez\n\ wywo�an� procedur� s� dziedziczone przez skrypt wywo�uj�cy CALL.\n" - WCMD_CD, "Pomoc o CD\n" - WCMD_CHDIR, "Pomoc o CHDIR\n" + WCMD_CD, "Pomoc do CD\n" + WCMD_CHDIR, "Pomoc do CHDIR\n" WCMD_CLS, "CLS czy�ci ekran konsoli\n" - WCMD_COPY, "Pomoc o COPY\n" - WCMD_CTTY, "Pomoc o CTTY\n" - WCMD_DATE, "Pomoc o DATE\n" - WCMD_DEL, "Pomoc o DEL\n" - WCMD_DIR, "Pomoc o DIR\n" + WCMD_COPY, "Pomoc do COPY\n" + WCMD_CTTY, "Pomoc do CTTY\n" + WCMD_DATE, "Pomoc do DATE\n" + WCMD_DEL, "Pomoc do DEL\n" + WCMD_DIR, "Pomoc do DIR\n" WCMD_ECHO, -"ECHO <ci�g znak�w> drukuje <ci�g znk�w> do aktualnego u��dzenia.\n\ +"ECHO <ci�g znak�w> drukuje <ci�g znak�w> do aktualnego urz�dzenia.\n\ \n\ ECHO ON powoduje, �e wszystkie komendy z pliku bat s� drukowane\n\ do aktualnego urz�dzenia przed wywo�aniem.\n\ @@ -63,7 +64,7 @@ zbioru.\n\ Sk�adnia: FOR %zmienna IN (zbi�r) DO polecenie\n\ \n\ Wym�g powtarzania znaku %, gdy u�ywamy komendy FOR w pliku bat nie\n\ -istnije w cmd\n" +istnieje w cmd\n" WCMD_GOTO, "Komenda GOTO przenosi kursor do innego miejsca w pliku bat.\n\ @@ -71,7 +72,7 @@ istnije w cmd\n" Etykieta, kt�ra jest celem skoku (komendy GOTO) mo�e mie� maksymalnie\n\ 255 znak�w d�ugo�ci, nie mo�e zawiera� spacji. Je�eli s� dwie (lub\n\ wi�cej) etykiety o takich samych nazwach skok zostanie wykonany do\n\ -pierwszej z nich. Je�eli etykieta nie istnije wykonywanie pliku zostaje\n\ +pierwszej z nich. Je�eli etykieta nie istnieje wykonywanie pliku zostaje\n\ przerwane.\n" WCMD_HELP, "Pomoc o HELP\n" @@ -84,7 +85,7 @@ Sk IF [NOT] ERRORLEVEL numer komenda\n\ \n\ W drugiej formie (ci�g_znak�w1==ci�g_znak�w2) ci�g znak�w musi by� zawarty w\n\ -cudzys�owie.Przy por�wnywaniu pomijana jest wielko�� znak�w.\n" +cudzys�owie. Przy por�wnywaniu pomijana jest wielko�� znak�w.\n" WCMD_LABEL, "LABEL jest u�ywane do ustawienia etykiety dysku.\n\ \n\ @@ -122,7 +123,7 @@ na ekranie.\n" "PROMPT ustawia tekst zg�oszenia konsoli.\n\ \n\ Tekst wyst�puj�cy za komend� (i spacje wyst�puj�ce za nim)\n\ -pojawiaj� si� na pocz�tku lini gdy cmd czeka na komend�.\n\ +pojawiaj� si� na pocz�tku linii gdy cmd czeka na komend�.\n\ \n\ Nast�puj�ce ci�gi znak�w maj� specjalne znaczenie:\n\ \n\ @@ -132,7 +133,7 @@ $l Znak < $n Dysk $p $q Znak = $t Czas $v Wersja cmd\n\ \n\ Wpisanie PROMPT bez opcji resetuje ustawienia konsoli zwi�zane z komend�\n\ -PROMPT, ustawia wy�wietlany tekst na �cie�ke i znak >.\n\ +PROMPT, ustawia wy�wietlany tekst na �cie�k� i znak >.\n\ (Tak samo jak polecenie PROMPT $p$g).\n\ \n\ Polecenie 'SET PROMPT=tekst' ma taki sam efekt jak 'PROMPT tekst'\n" @@ -149,7 +150,7 @@ stosowane jako komentarz w pliku typu bat.\n" WCMD_SET, "SET wy�wietla lub ustawia zmienne �rodowiskowe cmd.\n\ \n\ -SET bez parametr�w wy�witla wszystkie ustawione zmienne.\n\ +SET bez parametr�w wy�wietla wszystkie ustawione zmienne.\n\ \n\ Sk�adnia polecenia (by utworzy� lub zmodyfikowa� zmienn�:\n\ \n\ @@ -167,7 +168,7 @@ systemu.\n" WCMD_SHIFT, "SHIFT jest u�ywane w plikach bat do usuni�cia pierwszego parametru z listy\n\ parametr�w, parametr 2 staje sie 1 itd. Polecenie to nie ma efektu gdy jest\n\ -wywo�ywane z lini komend.\n" +wywo�ywane z linii komend.\n" WCMD_TIME, "Pomoc o TIME\n" @@ -233,39 +234,39 @@ VOL\t\tWy EXIT\t\tWy��cza CMD\n\n\ Wpisz HELP <komenda> dla dok�adniejszych informacji o komendzie\n" - WCMD_CONFIRM, "Are you sure" - WCMD_YES, "Y" + WCMD_CONFIRM, "Czy jeste� pewien?" + WCMD_YES, "T" WCMD_NO, "N" - WCMD_NOASSOC, "File association missing for extension %s\n" - WCMD_NOFTYPE, "No open command associated with file type '%s'\n" - WCMD_OVERWRITE, "Overwrite %s" - WCMD_MORESTR, "More..." + WCMD_NOASSOC, "Brak skojarzenia pliku dla rozszerzenia %s\n" + WCMD_NOFTYPE, "Brak skojarzenia polecenia otw�rz z typem plik�w '%s'\n" + WCMD_OVERWRITE, "Nadpisa� %s" + WCMD_MORESTR, "Wi�cej..." WCMD_TRUNCATEDLINE, "Line in Batch processing possibly truncated. Using:\n" - WCMD_NYI, "Not Yet Implemented\n\n" - WCMD_NOARG, "Argument missing\n" - WCMD_SYNTAXERR, "Syntax error\n" - WCMD_FILENOTFOUND, "%s : File Not Found\n" - WCMD_NOCMDHELP, "No help available for %s\n" - WCMD_NOTARGET, "Target to GOTO not found\n" - WCMD_CURRENTDATE, "Current Date is %s\n" - WCMD_CURRENTTIME, "Current Time is %s\n" - WCMD_NEWDATE, "Enter new date: " - WCMD_NEWTIME, "Enter new time: " - WCMD_MISSINGENV, "Environment variable %s not defined\n" - WCMD_READFAIL, "Failed to open '%s'\n" + WCMD_NYI, "Jeszcze niezaimplementowane\n\n" + WCMD_NOARG, "Brakuje argumentu\n" + WCMD_SYNTAXERR, "B��d sk�adni\n" + WCMD_FILENOTFOUND, "%s : Plik nie znaleziony\n" + WCMD_NOCMDHELP, "Plik pomocy nie istnieje dla %s\n" + WCMD_NOTARGET, "Nie znaleziono przeznaczenia dla GOTO\n" + WCMD_CURRENTDATE, "Aktualna data: %s\n" + WCMD_CURRENTTIME, "Aktualny czas: %s\n" + WCMD_NEWDATE, "Wpisz now� dat�: " + WCMD_NEWTIME, "Wpisz nowy czas: " + WCMD_MISSINGENV, "Zmienna �rodowiskowa %s niezdefiniowana\n" + WCMD_READFAIL, "Nieudane otwarcie '%s'\n" WCMD_CALLINSCRIPT, "Cannot call batch label outside of a batch script\n" WCMD_ALL, "A" - WCMD_DELPROMPT, "%s, Delete" - WCMD_ECHOPROMPT, "Echo is %s\n" - WCMD_VERIFYPROMPT, "Verify is %s\n" - WCMD_VERIFYERR, "Verify must be ON or OFF\n"; - WCMD_ARGERR, "Parameter error\n" - WCMD_VOLUMEDETAIL, "Volume in drive %c is %s\nVolume Serial Number is %04x-%04x\n\n" - WCMD_VOLUMEPROMPT, "Volume label (11 characters, ENTER for none)?" - WCMD_NOPATH, "PATH not found\n" - WCMD_ANYKEY,"Press Return key to continue: " - WCMD_CONSTITLE,"Wine Command Prompt" - WCMD_VERSION,"CMD Version %s\n\n" - WCMD_MOREPROMPT, "More? " - WCMD_LINETOOLONG, "The input line is too long.\n" + WCMD_DELPROMPT, "%s, Usun��" + WCMD_ECHOPROMPT, "Echo jest %s\n" + WCMD_VERIFYPROMPT, "Verify jest %s\n" + WCMD_VERIFYERR, "Verify musi by� ON lub OFF\n"; + WCMD_ARGERR, "B��d parametru\n" + WCMD_VOLUMEDETAIL, "Wolumenem w nap�dzie %c jest %s\nNumer seryjny wolumenu: %04x-%04x\n\n" + WCMD_VOLUMEPROMPT, "Etykieta Wolumenu (11 znak�w, ENTER aby pomin��)?" + WCMD_NOPATH, "Nie znaleziono PATH\n" + WCMD_ANYKEY,"Naci�nij klawisz Enter, aby kontynuowa�: " + WCMD_CONSTITLE,"Wiersz Polece� Wine" + WCMD_VERSION,"Wersja CMD %s\n\n" + WCMD_MOREPROMPT, "Wi�cej? " + WCMD_LINETOOLONG, "Wpisany tekst jest zbyt d�ugi.\n" }

1 0

Henri Verbeet : wined3d: Handle the destination modifier shift in the frontend rather than the backend .
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: fc60083ed204ec88a5c29fbfe14348ec28397dc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc60083ed204ec88a5c29fbfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 09:24:26 2009 +0200 wined3d: Handle the destination modifier shift in the frontend rather than the backend. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/baseshader.c | 4 ++-- dlls/wined3d/wined3d_private_types.h | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9b56958..1db1e46 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1000,10 +1000,10 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) partialprecision = mask & WINED3DSPDM_PARTIALPRECISION; mask &= ~(WINED3DSPDM_MSAMPCENTROID | WINED3DSPDM_PARTIALPRECISION | WINED3DSPDM_SATURATE); if (mask) - FIXME("Unrecognized modifier(%#x)\n", mask >> WINED3DSP_DSTMOD_SHIFT); + FIXME("Unrecognized modifier(%#x)\n", mask); if (centroid) - FIXME("Unhandled modifier(%#x)\n", mask >> WINED3DSP_DSTMOD_SHIFT); + FIXME("Unhandled modifier(%#x)\n", mask); } shift = dst->shift; modifier = (saturate && !shift) ? "_SAT" : ""; diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 31fffc5..7fcf769 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -234,7 +234,7 @@ static void shader_parse_dst_param(DWORD param, const struct wined3d_shader_src_ | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); dst->register_idx = param & WINED3DSP_REGNUM_MASK; dst->write_mask = param & WINED3DSP_WRITEMASK_ALL; - dst->modifiers = param & WINED3DSP_DSTMOD_MASK; + dst->modifiers = (param & WINED3DSP_DSTMOD_MASK) >> WINED3DSP_DSTMOD_SHIFT; dst->shift = (param & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; dst->rel_addr = rel_addr; } @@ -966,7 +966,7 @@ static void shader_dump_ins_modifiers(const DWORD output) mmask &= ~(WINED3DSPDM_SATURATE | WINED3DSPDM_PARTIALPRECISION | WINED3DSPDM_MSAMPCENTROID); if (mmask) - FIXME("_unrecognized_modifier(%#x)", mmask >> WINED3DSP_DSTMOD_SHIFT); + FIXME("_unrecognized_modifier(%#x)", mmask); } void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table) diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index 8a52e39..ebe2779 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -136,10 +136,10 @@ typedef enum _WINED3DSHADER_PARAM_SRCMOD_TYPE { #define WINED3DSP_DSTMOD_MASK (0xF << WINED3DSP_DSTMOD_SHIFT) typedef enum _WINED3DSHADER_PARAM_DSTMOD_TYPE { - WINED3DSPDM_NONE = 0 << WINED3DSP_DSTMOD_SHIFT, - WINED3DSPDM_SATURATE = 1 << WINED3DSP_DSTMOD_SHIFT, - WINED3DSPDM_PARTIALPRECISION = 2 << WINED3DSP_DSTMOD_SHIFT, - WINED3DSPDM_MSAMPCENTROID = 4 << WINED3DSP_DSTMOD_SHIFT, + WINED3DSPDM_NONE = 0, + WINED3DSPDM_SATURATE = 1, + WINED3DSPDM_PARTIALPRECISION = 2, + WINED3DSPDM_MSAMPCENTROID = 4, WINED3DSPDM_FORCE_DWORD = 0x7FFFFFFF } WINED3DSHADER_PARAM_DSTMOD_TYPE;

1 0

Henri Verbeet : wined3d: Move some frontend specfic code to baseshader.c.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: d6494ad00c0735ca818a9e16f5fd16429e2ca205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6494ad00c0735ca818a9e16f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 09:24:26 2009 +0200 wined3d: Move some frontend specfic code to baseshader.c. --- dlls/wined3d/baseshader.c | 18 +++++++++++++++++- dlls/wined3d/wined3d_private.h | 15 --------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 7fcf769..6380b5d 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -105,7 +105,23 @@ void shader_init(struct IWineD3DBaseShaderClass *shader, list_init(&shader->linked_programs); } -const SHADER_OPCODE *shader_get_opcode(const SHADER_OPCODE *opcode_table, DWORD shader_version, DWORD code) +static inline WINED3DSHADER_PARAM_REGISTER_TYPE shader_get_regtype(DWORD param) +{ + return ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) + | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); +} + +static inline DWORD shader_get_writemask(DWORD param) +{ + return param & WINED3DSP_WRITEMASK_ALL; +} + +static inline BOOL shader_is_comment(DWORD token) +{ + return WINED3DSIO_COMMENT == (token & WINED3DSI_OPCODE_MASK); +} + +static const SHADER_OPCODE *shader_get_opcode(const SHADER_OPCODE *opcode_table, DWORD shader_version, DWORD code) { DWORD i = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 758193e..50e0dac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2300,8 +2300,6 @@ extern int shader_addline( const char* fmt, ...) PRINTF_ATTR(2,3); int shader_vaddline(SHADER_BUFFER *buffer, const char *fmt, va_list args); -const SHADER_OPCODE *shader_get_opcode(const SHADER_OPCODE *shader_ins, DWORD shader_version, DWORD code); - /* Vertex shader utility functions */ extern BOOL vshader_get_input( IWineD3DVertexShader* iface, @@ -2367,15 +2365,6 @@ void shader_trace_init(const DWORD *byte_code, const SHADER_OPCODE *opcode_table extern void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, const shader_reg_maps *reg_maps, const DWORD *pFunction); -static inline int shader_get_regtype(const DWORD param) { - return (((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) | - ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2)); -} - -static inline int shader_get_writemask(const DWORD param) { - return param & WINED3DSP_WRITEMASK_ALL; -} - static inline BOOL shader_is_pshader_version(DWORD token) { return 0xFFFF0000 == (token & 0xFFFF0000); } @@ -2384,10 +2373,6 @@ static inline BOOL shader_is_vshader_version(DWORD token) { return 0xFFFE0000 == (token & 0xFFFF0000); } -static inline BOOL shader_is_comment(DWORD token) { - return WINED3DSIO_COMMENT == (token & WINED3DSI_OPCODE_MASK); -} - static inline BOOL shader_is_scalar(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx) { switch (register_type)

1 0

Henri Verbeet : wined3d: Move frontend specfic constants to baseshader.c.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: fba6f871cfafb093c640718d923c19d1a1fa8a3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fba6f871cfafb093c640718d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 09:24:26 2009 +0200 wined3d: Move frontend specfic constants to baseshader.c. --- dlls/wined3d/baseshader.c | 58 ++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private_types.h | 57 --------------------------------- 2 files changed, 58 insertions(+), 57 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 6380b5d..d4da80b 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -32,6 +32,64 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d); +/* DCL usage masks */ +#define WINED3DSP_DCL_USAGE_SHIFT 0 +#define WINED3DSP_DCL_USAGE_MASK (0xf << WINED3DSP_DCL_USAGE_SHIFT) +#define WINED3DSP_DCL_USAGEINDEX_SHIFT 16 +#define WINED3DSP_DCL_USAGEINDEX_MASK (0xf << WINED3DSP_DCL_USAGEINDEX_SHIFT) + +/* Opcode-related masks */ +#define WINED3DSI_OPCODE_MASK 0x0000ffff + +#define WINED3D_OPCODESPECIFICCONTROL_SHIFT 16 +#define WINED3D_OPCODESPECIFICCONTROL_MASK (0xff << WINED3D_OPCODESPECIFICCONTROL_SHIFT) + +#define WINED3DSI_INSTLENGTH_SHIFT 24 +#define WINED3DSI_INSTLENGTH_MASK (0xf << WINED3DSI_INSTLENGTH_SHIFT) + +#define WINED3DSI_COISSUE (1 << 30) + +#define WINED3DSI_COMMENTSIZE_SHIFT 16 +#define WINED3DSI_COMMENTSIZE_MASK (0x7fff << WINED3DSI_COMMENTSIZE_SHIFT) + +#define WINED3DSHADER_INSTRUCTION_PREDICATED (1 << 28) + +/* Register number mask */ +#define WINED3DSP_REGNUM_MASK 0x000007ff + +/* Register type masks */ +#define WINED3DSP_REGTYPE_SHIFT 28 +#define WINED3DSP_REGTYPE_MASK (0x7 << WINED3DSP_REGTYPE_SHIFT) +#define WINED3DSP_REGTYPE_SHIFT2 8 +#define WINED3DSP_REGTYPE_MASK2 (0x18 << WINED3DSP_REGTYPE_SHIFT2) + +/* Relative addressing mask */ +#define WINED3DSHADER_ADDRESSMODE_SHIFT 13 +#define WINED3DSHADER_ADDRESSMODE_MASK (1 << WINED3DSHADER_ADDRESSMODE_SHIFT) + +/* Destination modifier mask */ +#define WINED3DSP_DSTMOD_SHIFT 20 +#define WINED3DSP_DSTMOD_MASK (0xf << WINED3DSP_DSTMOD_SHIFT) + +/* Destination shift mask */ +#define WINED3DSP_DSTSHIFT_SHIFT 24 +#define WINED3DSP_DSTSHIFT_MASK (0xf << WINED3DSP_DSTSHIFT_SHIFT) + +/* Swizzle mask */ +#define WINED3DSP_SWIZZLE_SHIFT 16 +#define WINED3DSP_SWIZZLE_MASK (0xff << WINED3DSP_SWIZZLE_SHIFT) + +/* Source modifier mask */ +#define WINED3DSP_SRCMOD_SHIFT 24 +#define WINED3DSP_SRCMOD_MASK (0xf << WINED3DSP_SRCMOD_SHIFT) + +typedef enum _WINED3DSHADER_ADDRESSMODE_TYPE +{ + WINED3DSHADER_ADDRMODE_ABSOLUTE = 0 << WINED3DSHADER_ADDRESSMODE_SHIFT, + WINED3DSHADER_ADDRMODE_RELATIVE = 1 << WINED3DSHADER_ADDRESSMODE_SHIFT, + WINED3DSHADER_ADDRMODE_FORCE_DWORD = 0x7fffffff, +} WINED3DSHADER_ADDRESSMODE_TYPE; + static void shader_dump_param(const DWORD param, const DWORD addr_token, int input, DWORD shader_version); static inline BOOL shader_is_version_token(DWORD token) { diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index ebe2779..379f3f3 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -31,12 +31,6 @@ #define WINED3DFMT_FLAG_RENDERTARGET 0x10 #define WINED3DFMT_FLAG_FOURCC 0x20 -/** DCL usage masks **/ -#define WINED3DSP_DCL_USAGE_SHIFT 0 -#define WINED3DSP_DCL_USAGE_MASK 0x0000000f -#define WINED3DSP_DCL_USAGEINDEX_SHIFT 16 -#define WINED3DSP_DCL_USAGEINDEX_MASK 0x000f0000 - /** DCL sampler texture type **/ #define WINED3DSP_TEXTURETYPE_SHIFT 27 #define WINED3DSP_TEXTURETYPE_MASK 0x78000000 @@ -51,15 +45,6 @@ typedef enum _WINED3DSAMPLER_TEXTURE_TYPE { WINED3DSTT_FORCE_DWORD = 0x7FFFFFFF } WINED3DSAMPLER_TEXTURE_TYPE; -/** Register number mask **/ -#define WINED3DSP_REGNUM_MASK 0x000007FF - -/** Register type masks **/ -#define WINED3DSP_REGTYPE_SHIFT 28 -#define WINED3DSP_REGTYPE_SHIFT2 8 -#define WINED3DSP_REGTYPE_MASK (0x7 << WINED3DSP_REGTYPE_SHIFT) -#define WINED3DSP_REGTYPE_MASK2 0x00001800 - /** Register types **/ typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE { WINED3DSPR_TEMP = 0, @@ -97,15 +82,8 @@ typedef enum _WINED3DVS_RASTOUT_OFFSETS { WINED3DSRO_FORCE_DWORD = 0x7FFFFFFF } WINED3DVS_RASTOUT_OFFSETS; -/** Source register modifiers **/ -#define WINED3DSP_SWIZZLE_SHIFT 16 -#define WINED3DSP_SWIZZLE_MASK (0xFF << WINED3DSP_SWIZZLE_SHIFT) - #define WINED3DSP_NOSWIZZLE (0 | (1 << 2) | (2 << 4) | (3 << 6)) -#define WINED3DSP_SRCMOD_SHIFT 24 -#define WINED3DSP_SRCMOD_MASK (0xF << WINED3DSP_SRCMOD_SHIFT) - typedef enum _WINED3DSHADER_PARAM_SRCMOD_TYPE { WINED3DSPSM_NONE = 0, WINED3DSPSM_NEG = 1, @@ -132,9 +110,6 @@ typedef enum _WINED3DSHADER_PARAM_SRCMOD_TYPE { #define WINED3DSP_WRITEMASK_3 0x00080000 /* .w a */ #define WINED3DSP_WRITEMASK_ALL 0x000F0000 /* all */ -#define WINED3DSP_DSTMOD_SHIFT 20 -#define WINED3DSP_DSTMOD_MASK (0xF << WINED3DSP_DSTMOD_SHIFT) - typedef enum _WINED3DSHADER_PARAM_DSTMOD_TYPE { WINED3DSPDM_NONE = 0, WINED3DSPDM_SATURATE = 1, @@ -144,20 +119,6 @@ typedef enum _WINED3DSHADER_PARAM_DSTMOD_TYPE { WINED3DSPDM_FORCE_DWORD = 0x7FFFFFFF } WINED3DSHADER_PARAM_DSTMOD_TYPE; -#define WINED3DSP_DSTSHIFT_SHIFT 24 -#define WINED3DSP_DSTSHIFT_MASK (0xF << WINED3DSP_DSTSHIFT_SHIFT) - -/** Register addressing modes **/ -#define WINED3DSHADER_ADDRESSMODE_SHIFT 13 -#define WINED3DSHADER_ADDRESSMODE_MASK (1 << WINED3DSHADER_ADDRESSMODE_SHIFT) - -typedef enum _WINED3DSHADER_ADDRESSMODE_TYPE { - WINED3DSHADER_ADDRMODE_ABSOLUTE = 0 << WINED3DSHADER_ADDRESSMODE_SHIFT, - WINED3DSHADER_ADDRMODE_RELATIVE = 1 << WINED3DSHADER_ADDRESSMODE_SHIFT, - - WINED3DSHADER_ADDRMODE_FORCE_DWORD = 0x7FFFFFFF -} WINED3DSHADER_ADDRESSMODE_TYPE; - /** Opcode types */ typedef enum _WINED3DSHADER_INSTRUCTION_OPCODE_TYPE { WINED3DSIO_NOP = 0, @@ -251,24 +212,6 @@ typedef enum _WINED3DSHADER_INSTRUCTION_OPCODE_TYPE { WINED3DSIO_FORCE_DWORD = 0X7FFFFFFF /** for 32-bit alignment */ } WINED3DSHADER_INSTRUCTION_OPCODE_TYPE; -/** opcode-related masks **/ - -#define WINED3D_OPCODESPECIFICCONTROL_MASK 0x00ff0000 -#define WINED3D_OPCODESPECIFICCONTROL_SHIFT 16 - -#define WINED3DSI_OPCODE_MASK 0x0000FFFF -#define WINED3DSI_INSTLENGTH_MASK 0x0F000000 -#define WINED3DSI_INSTLENGTH_SHIFT 24 - -#define WINED3DSI_COISSUE 0x40000000 - -#define WINED3DSI_COMMENTSIZE_SHIFT 16 -#define WINED3DSI_COMMENTSIZE_MASK (0x7FFF << WINED3DSI_COMMENTSIZE_SHIFT) -#define WINED3DSHADER_COMMENT(commentSize) \ - ((((commentSize) << WINED3DSI_COMMENTSIZE_SHIFT) & WINED3DSI_COMMENTSIZE_MASK) | WINED3DSIO_COMMENT) - -#define WINED3DSHADER_INSTRUCTION_PREDICATED (1 << 28) - /* Undocumented opcode control to identify projective texture lookups in ps 2.0 and later */ #define WINED3DSI_TEXLD_PROJECT 0x00010000 #define WINED3DSI_TEXLD_BIAS 0x00020000

1 0

Henri Verbeet : wined3d: Downgrade an ERR to a WARN.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: f88bd17ef6546be5b8129a0fd48e0bad028161d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f88bd17ef6546be5b8129a0fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 09:24:26 2009 +0200 wined3d: Downgrade an ERR to a WARN. --- dlls/wined3d/surface_gdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 0ed350e..0ad65e0 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -130,7 +130,7 @@ IWineGDISurfaceImpl_LockRect(IWineD3DSurface *iface, /* Already locked? */ if(This->Flags & SFLAG_LOCKED) { - ERR("(%p) Surface already locked\n", This); + WARN("(%p) Surface already locked\n", This); /* What should I return here? */ return WINED3DERR_INVALIDCALL; }

1 0

Henri Verbeet : wined3d: Get rid of the shared_handle parameter.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 6f33b97c947935d051916fedb5f23eb80cd5583f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f33b97c947935d051916fedb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 09:24:27 2009 +0200 wined3d: Get rid of the shared_handle parameter. I don't expect us to support this in the near future, and right now it's just dead code. --- dlls/d3d10core/device.c | 2 +- dlls/d3d8/device.c | 18 ++++++++---------- dlls/d3d9/cubetexture.c | 3 +-- dlls/d3d9/device.c | 6 +++--- dlls/d3d9/indexbuffer.c | 3 +-- dlls/d3d9/texture.c | 2 +- dlls/d3d9/vertexbuffer.c | 3 +-- dlls/d3d9/volumetexture.c | 4 ++-- dlls/ddraw/ddraw.c | 43 +++++++++---------------------------------- dlls/ddraw/direct3d.c | 14 +++++--------- dlls/wined3d/device.c | 43 ++++++++++++++++++++++--------------------- dlls/wined3d/surface_base.c | 21 +++++---------------- include/wine/wined3d.idl | 7 ------- 13 files changed, 59 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f33b97c947935d051916…

1 0

Nikolay Sivov : comctl32/tests: Remove tests failing on most platforms.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 946936c2742849e77d71f3d566afedfab60ec183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=946936c2742849e77d71f3d56… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 23 11:51:41 2009 +0400 comctl32/tests: Remove tests failing on most platforms. --- dlls/comctl32/tests/listview.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 61dca76..6482c74 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -994,11 +994,6 @@ static void test_create(void) ok(!IsWindow(hHeader), "Header shouldn't be created\n"); ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); - expect(0, rect.left); - expect(0, rect.right); - expect(0, rect.top); - expect(0, rect.bottom); - DestroyWindow(hList); }

1 0