wine-commits January 2010

wine-commits@winehq.org

3 participants
615 discussions

Alexandre Julliard : msi: Add a partial stub for the ValidateProductID control event.
by Alexandre Julliard 20 Jan '10

20 Jan '10

Module: wine Branch: master Commit: de3fa09cb2ec982e97021fd765d0ea16318b618a URL: http://source.winehq.org/git/wine.git/?a=commit;h=de3fa09cb2ec982e97021fd76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 20 15:36:00 2010 +0100 msi: Add a partial stub for the ValidateProductID control event. --- dlls/msi/events.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 6275a95..f4697dd 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -383,6 +383,28 @@ static UINT ControlEvent_ReinstallMode(MSIPACKAGE *package, LPCWSTR argument, return MSI_SetPropertyW( package, szReinstallMode, argument ); } +static UINT ControlEvent_ValidateProductID(MSIPACKAGE *package, LPCWSTR argument, + msi_dialog *dialog) +{ + static const WCHAR szProductID[] = {'P','r','o','d','u','c','t','I','D',0}; + static const WCHAR szPIDTemplate[] = {'P','I','D','T','e','m','p','l','a','t','e',0}; + static const WCHAR szPIDKEY[] = {'P','I','D','K','E','Y',0}; + LPWSTR key, template; + UINT ret = ERROR_SUCCESS; + + template = msi_dup_property( package, szPIDTemplate ); + key = msi_dup_property( package, szPIDKEY ); + + if (key && template) + { + FIXME( "partial stub: template %s key %s\n", debugstr_w(template), debugstr_w(key) ); + ret = MSI_SetPropertyW( package, szProductID, key ); + } + msi_free( template ); + msi_free( key ); + return ret; +} + static const struct _events Events[] = { { "EndDialog",ControlEvent_EndDialog }, { "NewDialog",ControlEvent_NewDialog }, @@ -398,6 +420,7 @@ static const struct _events Events[] = { { "DirectoryListUp",ControlEvent_DirectoryListUp }, { "SelectionBrowse",ControlEvent_SpawnDialog }, { "ReinstallMode",ControlEvent_ReinstallMode }, + { "ValidateProductID",ControlEvent_ValidateProductID }, { NULL,NULL }, };

1 0

André Hentschel : kernel32/tests: Initial fiber tests.
by Alexandre Julliard 20 Jan '10

20 Jan '10

Module: wine Branch: master Commit: 643625b9e04b95ca94025fcfdc688916bca25398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=643625b9e04b95ca94025fcfd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 20 12:37:15 2010 +0100 kernel32/tests: Initial fiber tests. --- dlls/kernel32/tests/Makefile.in | 1 + dlls/kernel32/tests/fiber.c | 86 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index 0c81c29..083f8ab 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -17,6 +17,7 @@ CTESTS = \ directory.c \ drive.c \ environ.c \ + fiber.c \ file.c \ format_msg.c \ generated.c \ diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c new file mode 100644 index 0000000..34bc0c3 --- /dev/null +++ b/dlls/kernel32/tests/fiber.c @@ -0,0 +1,86 @@ +/* + * Unit tests for fiber functions + * + * Copyright (c) 2010 André Hentschel + * + * 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 "wine/test.h" + +static LPVOID (WINAPI *pCreateFiber)(SIZE_T,LPFIBER_START_ROUTINE,LPVOID); +static LPVOID (WINAPI *pConvertThreadToFiber)(LPVOID); +static BOOL (WINAPI *pConvertFiberToThread)(void); +static void (WINAPI *pSwitchToFiber)(LPVOID); +static void (WINAPI *pDeleteFiber)(LPVOID); + +static LPVOID fibers[2]; +static BYTE testparam = 187; + +static BOOL init_funcs(void) +{ + HMODULE hKernel32 = GetModuleHandle("kernel32"); + +#define X(f) if (!(p##f = (void*)GetProcAddress(hKernel32, #f))) return FALSE; + X(CreateFiber); + X(ConvertThreadToFiber); + X(ConvertFiberToThread); + X(SwitchToFiber); + X(DeleteFiber); +#undef X + + return TRUE; +} + +static VOID WINAPI FiberMainProc(LPVOID lpFiberParameter) +{ + BYTE *tparam = (BYTE *)lpFiberParameter; + ok(*tparam == 187, "Parameterdata expected not to be changed\n"); + pSwitchToFiber(fibers[0]); +} + +static void test_ConvertThreadToFiber(void) +{ + fibers[0] = pConvertThreadToFiber(&testparam); + ok(fibers[0] != 0, "ConvertThreadToFiber failed with error %d\n", GetLastError()); +} + +static void test_ConvertFiberToThread(void) +{ + ok(pConvertFiberToThread() , "ConvertThreadToFiber failed with error %d\n", GetLastError()); +} + +static void test_CreateFiber(void) +{ + fibers[1] = pCreateFiber(0,FiberMainProc,&testparam); + ok(fibers[1] != 0, "CreateFiber failed with error %d\n", GetLastError()); + + pSwitchToFiber(fibers[1]); + pDeleteFiber(fibers[1]); +} + +START_TEST(fiber) +{ + if (!init_funcs()) + { + win_skip("Needed functions are not available\n"); + return; + } + + test_ConvertThreadToFiber(); + test_ConvertFiberToThread(); + test_ConvertThreadToFiber(); + test_CreateFiber(); +}

1 0

Freddie Tilley : ntdll: Set cpu frequency for FreeBSD 7.2 and higher.
by Alexandre Julliard 20 Jan '10

20 Jan '10

Module: wine Branch: master Commit: 69d7233e3e6de5e792f744f6c9666612b5fe129c URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d7233e3e6de5e792f744f6c… Author: Freddie Tilley <freddie.tilley(a)gmail.com> Date: Wed Jan 20 11:59:25 2010 +0100 ntdll: Set cpu frequency for FreeBSD 7.2 and higher. --- dlls/ntdll/nt.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index bc01a4f..5cc4877 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1136,6 +1136,10 @@ void fill_cpu_info(void) ret = sysctlbyname("hw.ncpu", &num, &len, NULL, 0); if (!ret) NtCurrentTeb()->Peb->NumberOfProcessors = num; + + len = sizeof(num); + if (!sysctlbyname("dev.cpu.0.freq", &num, &len, NULL, 0)) + cpuHz = num * 1000 * 1000; } #elif defined(__sun) {

1 0

Jason Edmeades : msi: Correct the setting of environment variables.
by Alexandre Julliard 20 Jan '10

20 Jan '10

Module: wine Branch: master Commit: 06c45a8d59194f93b449d05524af969dad1ab2e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06c45a8d59194f93b449d0552… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Wed Jan 20 09:40:37 2010 +0000 msi: Correct the setting of environment variables. Contrary to the MSDN, you can 'create only' whilst using a previous value (ie +-variable and [~];value). This breaks the install of an application I was debugging who uses that throughout for all their variables. In addition whilst adding some tests I've also cleaned up invalid prefix syntax handling and semicolon removal if the original string is empty. --- dlls/msi/action.c | 36 ++++++++++++++++++++++-------- dlls/msi/tests/install.c | 53 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 77 insertions(+), 12 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 50f2007..fef8eae 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4924,16 +4924,30 @@ static LONG env_set_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags ) LPCWSTR ptr = *value; if (!strncmpW(ptr, prefix, prefix_len)) { - *flags |= ENV_MOD_APPEND; - *value += lstrlenW(prefix); + if (ptr[prefix_len] == szSemiColon[0]) + { + *flags |= ENV_MOD_APPEND; + *value += lstrlenW(prefix); + } + else + { + *value = NULL; + } } else if (lstrlenW(*value) >= prefix_len) { ptr += lstrlenW(ptr) - prefix_len; if (!lstrcmpW(ptr, prefix)) { - *flags |= ENV_MOD_PREFIX; - /* the "[~]" will be removed by deformat_string */; + if ((ptr-1) > *value && *(ptr-1) == szSemiColon[0]) + { + *flags |= ENV_MOD_PREFIX; + /* the "[~]" will be removed by deformat_string */; + } + else + { + *value = NULL; + } } } } @@ -4979,7 +4993,7 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) TRACE("name %s value %s\n", debugstr_w(name), debugstr_w(value)); res = env_set_flags(&name, &value, &flags); - if (res != ERROR_SUCCESS) + if (res != ERROR_SUCCESS || !value) goto done; if (value && !deformat_string(package, value, &deformatted)) @@ -5025,6 +5039,9 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) goto done; } + /* If we are appending but the string was empty, strip ; */ + if ((flags & ENV_MOD_APPEND) && (value[0] == szSemiColon[0])) value++; + size = (lstrlenW(value) + 1) * sizeof(WCHAR); newval = strdupW(value); if (!newval) @@ -5035,7 +5052,8 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) } else { - if (flags & ENV_ACT_SETABSENT) + /* Contrary to MSDN, +-variable to [~];path works */ + if (flags & ENV_ACT_SETABSENT && !(flags & ENV_MOD_MASK)) { res = ERROR_SUCCESS; goto done; @@ -5065,7 +5083,7 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) int multiplier = 0; if (flags & ENV_MOD_APPEND) multiplier++; if (flags & ENV_MOD_PREFIX) multiplier++; - mod_size = (lstrlenW(value) + 1) * multiplier; + mod_size = lstrlenW(value) * multiplier; size += mod_size * sizeof(WCHAR); } @@ -5080,15 +5098,13 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) if (flags & ENV_MOD_PREFIX) { lstrcpyW(newval, value); - lstrcatW(newval, szSemiColon); - ptr = newval + lstrlenW(value) + 1; + ptr = newval + lstrlenW(value); } lstrcpyW(ptr, data); if (flags & ENV_MOD_APPEND) { - lstrcatW(newval, szSemiColon); lstrcatW(newval, value); } } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index c1e0afc..701192b 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -226,7 +226,36 @@ static const CHAR environment_dat[] = "Environment\tName\tValue\tComponent_\n" "Var7\t!-MSITESTVAR7\t\tOne\n" "Var8\t!-*MSITESTVAR8\t\tOne\n" "Var9\t=-MSITESTVAR9\t\tOne\n" - "Var10\t=MSITESTVAR10\t\tOne\n"; + "Var10\t=MSITESTVAR10\t\tOne\n" + "Var11\t+-MSITESTVAR11\t[~];1\tOne\n" + "Var12\t+-MSITESTVAR11\t[~];2\tOne\n" + "Var13\t+-MSITESTVAR12\t[~];1\tOne\n" + "Var14\t=MSITESTVAR13\t[~];1\tOne\n" + "Var15\t=MSITESTVAR13\t[~];2\tOne\n" + "Var16\t=MSITESTVAR14\t;1;\tOne\n" + "Var17\t=MSITESTVAR15\t;;1;;\tOne\n" + "Var18\t=MSITESTVAR16\t 1 \tOne\n" + "Var19\t+-MSITESTVAR17\t1\tOne\n" + "Var20\t+-MSITESTVAR17\t;;2;;[~]\tOne\n" + "Var21\t+-MSITESTVAR18\t1\tOne\n" + "Var22\t+-MSITESTVAR18\t[~];;2;;\tOne\n" + "Var23\t+-MSITESTVAR19\t1\tOne\n" + "Var24\t+-MSITESTVAR19\t[~]2\tOne\n" + "Var25\t+-MSITESTVAR20\t1\tOne\n" + "Var26\t+-MSITESTVAR20\t2[~]\tOne\n"; + +/* Expected results, starting from MSITESTVAR11 onwards */ +static const CHAR *environment_dat_results[] = {"1;2", /*MSITESTVAR11*/ + "1", /*MSITESTVAR12*/ + "1;2", /*MSITESTVAR13*/ + ";1;", /*MSITESTVAR14*/ + ";;1;;", /*MSITESTVAR15*/ + " 1 ", /*MSITESTVAR16*/ + ";;2;;1", /*MSITESTVAR17*/ + "1;;2;;", /*MSITESTVAR18*/ + "1", /*MSITESTVAR19*/ + "1", /*MSITESTVAR20*/ + NULL}; static const CHAR condition_dat[] = "Feature_\tLevel\tCondition\n" "s38\ti2\tS255\n" @@ -6732,6 +6761,7 @@ static void test_envvar(void) LONG res; DWORD type, size; char buffer[16]; + UINT i; if (on_win9x) { @@ -6800,8 +6830,27 @@ static void test_envvar(void) res = RegDeleteValueA(env, "MSITESTVAR10"); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - RegCloseKey(env); + i = 11; + while (environment_dat_results[(i-11)]) { + char name[20]; + sprintf(name, "MSITESTVAR%d", i); + + type = REG_NONE; + size = sizeof(buffer); + buffer[0] = 0; + res = RegQueryValueExA(env, name, NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "%d: Expected ERROR_SUCCESS, got %d\n", i, res); + ok(type == REG_SZ, "%d: Expected REG_SZ, got %u\n", i, type); + ok(!lstrcmp(buffer, environment_dat_results[(i-11)]), "%d: Expected %s, got %s\n", + i, environment_dat_results[(i-11)], buffer); + + res = RegDeleteValueA(env, name); + ok(res == ERROR_SUCCESS, "%d: Expected ERROR_SUCCESS, got %d\n", i, res); + i++; + } + + RegCloseKey(env); delete_pf("msitest\\cabout\\new\\five.txt", TRUE); delete_pf("msitest\\cabout\\new", FALSE); delete_pf("msitest\\cabout\\four.txt", TRUE);

1 0

Maarten Lankhorst : avifile: Fix playback of fixed sample size audio streams.
by Alexandre Julliard 20 Jan '10

20 Jan '10

Module: wine Branch: master Commit: bfe9e6d74c833b485116bb51bb3196daf661b332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe9e6d74c833b485116bb51b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Jan 20 01:08:31 2010 +0100 avifile: Fix playback of fixed sample size audio streams. --- dlls/avifil32/avifile.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index c034a6b..e627196 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1087,6 +1087,15 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start, LONG block = start; LONG offset = 0; + if (!buffer) + { + if (bytesread) + *bytesread = samples*This->sInfo.dwSampleSize; + if (samplesread) + *samplesread = samples; + return AVIERR_OK; + } + /* convert start sample to block,offset pair */ AVIFILE_SamplesToBlock(This, &block, &offset);

1 0

Henri Verbeet : d3d9: Add a separate function for stateblock initialization .
by Alexandre Julliard 20 Jan '10

20 Jan '10

Module: wine Branch: master Commit: 7f8ccf03426b7558852ade31744bafb5a549beca URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f8ccf03426b7558852ade317… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 19 23:52:29 2010 +0100 d3d9: Add a separate function for stateblock initialization. --- dlls/d3d9/d3d9_private.h | 7 +-- dlls/d3d9/device.c | 91 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/stateblock.c | 98 ++++++++++----------------------------------- 3 files changed, 115 insertions(+), 81 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index c01da91..eb3a032 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -187,11 +187,6 @@ HRESULT device_init(IDirect3DDevice9Impl *device, IWineD3D *wined3d, UINT adapte extern HRESULT WINAPI IDirect3DDevice9Impl_GetSwapChain(IDirect3DDevice9Ex *iface, UINT iSwapChain, IDirect3DSwapChain9 **pSwapChain) DECLSPEC_HIDDEN; extern UINT WINAPI IDirect3DDevice9Impl_GetNumberOfSwapChains(IDirect3DDevice9Ex *iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI IDirect3DDevice9Impl_CreateStateBlock(IDirect3DDevice9Ex *iface, - D3DSTATEBLOCKTYPE Type, IDirect3DStateBlock9 **ppSB) DECLSPEC_HIDDEN; -extern HRESULT WINAPI IDirect3DDevice9Impl_BeginStateBlock(IDirect3DDevice9Ex *iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI IDirect3DDevice9Impl_EndStateBlock(IDirect3DDevice9Ex *iface, - IDirect3DStateBlock9 **ppSB) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_SetVertexDeclaration(IDirect3DDevice9Ex *iface, IDirect3DVertexDeclaration9 *pDecl) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_GetVertexDeclaration(IDirect3DDevice9Ex *iface, @@ -467,6 +462,8 @@ typedef struct IDirect3DStateBlock9Impl { LPDIRECT3DDEVICE9EX parentDevice; } IDirect3DStateBlock9Impl; +HRESULT stateblock_init(IDirect3DStateBlock9Impl *stateblock, IDirect3DDevice9Impl *device, + D3DSTATEBLOCKTYPE type, IWineD3DStateBlock *wined3d_stateblock) DECLSPEC_HIDDEN; /* --------------------------- */ /* IDirect3DVertexDeclaration9 */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 35eaf7c..79a9ba0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1414,6 +1414,97 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderState(LPDIRECT3DDEVICE9EX return hr; } +static HRESULT WINAPI IDirect3DDevice9Impl_CreateStateBlock(IDirect3DDevice9Ex *iface, + D3DSTATEBLOCKTYPE type, IDirect3DStateBlock9 **stateblock) +{ + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + IDirect3DStateBlock9Impl *object; + HRESULT hr; + + TRACE("iface %p, type %#x, stateblock %p.\n", iface, type, stateblock); + + if (type != D3DSBT_ALL && type != D3DSBT_PIXELSTATE && type != D3DSBT_VERTEXSTATE) + { + WARN("Unexpected stateblock type, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate stateblock memory.\n"); + return E_OUTOFMEMORY; + } + + hr = stateblock_init(object, This, type, NULL); + if (FAILED(hr)) + { + WARN("Failed to initialize stateblock, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created stateblock %p.\n", object); + *stateblock = (IDirect3DStateBlock9 *)object; + + return D3D_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_BeginStateBlock(IDirect3DDevice9Ex *iface) +{ + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + HRESULT hr; + + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + hr = IWineD3DDevice_BeginStateBlock(This->WineD3DDevice); + wined3d_mutex_unlock(); + + return hr; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_EndStateBlock(IDirect3DDevice9Ex *iface, IDirect3DStateBlock9 **stateblock) +{ + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + IWineD3DStateBlock *wined3d_stateblock; + IDirect3DStateBlock9Impl *object; + HRESULT hr; + + TRACE("iface %p, stateblock %p.\n", iface, stateblock); + + wined3d_mutex_lock(); + hr = IWineD3DDevice_EndStateBlock(This->WineD3DDevice, &wined3d_stateblock); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("IWineD3DDevice_EndStateBlock() failed, hr %#x.\n", hr); + return hr; + } + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate stateblock memory.\n"); + IWineD3DStateBlock_Release(wined3d_stateblock); + return E_OUTOFMEMORY; + } + + hr = stateblock_init(object, This, 0, wined3d_stateblock); + if (FAILED(hr)) + { + WARN("Failed to initialize stateblock, hr %#x.\n", hr); + IWineD3DStateBlock_Release(wined3d_stateblock); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created stateblock %p.\n", object); + *stateblock = (IDirect3DStateBlock9 *)object; + + return D3D_OK; +} + static HRESULT WINAPI IDirect3DDevice9Impl_SetClipStatus(LPDIRECT3DDEVICE9EX iface, CONST D3DCLIPSTATUS9* pClipStatus) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 7cd3ba6..c4941db 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -123,87 +123,33 @@ static const IDirect3DStateBlock9Vtbl Direct3DStateBlock9_Vtbl = IDirect3DStateBlock9Impl_Apply }; - -/* IDirect3DDevice9 IDirect3DStateBlock9 Methods follow: */ -HRESULT WINAPI IDirect3DDevice9Impl_CreateStateBlock(LPDIRECT3DDEVICE9EX iface, D3DSTATEBLOCKTYPE Type, IDirect3DStateBlock9** ppStateBlock) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - IDirect3DStateBlock9Impl* object; - HRESULT hrc = D3D_OK; - - TRACE("iface %p, type %#x, stateblock %p.\n", iface, Type, ppStateBlock); - - if(Type != D3DSBT_ALL && Type != D3DSBT_PIXELSTATE && - Type != D3DSBT_VERTEXSTATE ) { - WARN("Unexpected stateblock type, returning D3DERR_INVALIDCALL\n"); - return D3DERR_INVALIDCALL; - } - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DStateBlock9Impl)); - if (NULL == object) return E_OUTOFMEMORY; - object->lpVtbl = &Direct3DStateBlock9_Vtbl; - object->ref = 1; - - wined3d_mutex_lock(); - hrc = IWineD3DDevice_CreateStateBlock(This->WineD3DDevice, (WINED3DSTATEBLOCKTYPE)Type, &object->wineD3DStateBlock, (IUnknown*)object); - wined3d_mutex_unlock(); - - if(hrc != D3D_OK){ - FIXME("(%p) Call to IWineD3DDevice_CreateStateBlock failed.\n", This); - HeapFree(GetProcessHeap(), 0, object); - } else { - IDirect3DDevice9Ex_AddRef(iface); - object->parentDevice = iface; - *ppStateBlock = (IDirect3DStateBlock9*)object; - TRACE("(%p) : Created stateblock %p\n", This, object); - } - TRACE("(%p) returning token (ptr to stateblock) of %p\n", This, object); - return hrc; -} - -HRESULT WINAPI IDirect3DDevice9Impl_BeginStateBlock(IDirect3DDevice9Ex *iface) +HRESULT stateblock_init(IDirect3DStateBlock9Impl *stateblock, IDirect3DDevice9Impl *device, + D3DSTATEBLOCKTYPE type, IWineD3DStateBlock *wined3d_stateblock) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("iface %p.\n", iface); - - wined3d_mutex_lock(); - hr = IWineD3DDevice_BeginStateBlock(This->WineD3DDevice); - wined3d_mutex_unlock(); - - return hr; -} + stateblock->lpVtbl = &Direct3DStateBlock9_Vtbl; + stateblock->ref = 1; -HRESULT WINAPI IDirect3DDevice9Impl_EndStateBlock(IDirect3DDevice9Ex *iface, IDirect3DStateBlock9 **ppSB) -{ - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - IWineD3DStateBlock *wineD3DStateBlock; - IDirect3DStateBlock9Impl *object; - HRESULT hr; - - TRACE("iface %p, stateblock %p.\n", iface, ppSB); - - /* Tell wineD3D to endstateblock before anything else (in case we run out - * of memory later and cause locking problems) */ - wined3d_mutex_lock(); - hr=IWineD3DDevice_EndStateBlock(This->WineD3DDevice,&wineD3DStateBlock); - wined3d_mutex_unlock(); - - if (hr!= D3D_OK) + if (wined3d_stateblock) { - WARN("IWineD3DDevice_EndStateBlock returned an error\n"); - return hr; + stateblock->wineD3DStateBlock = wined3d_stateblock; } - /* allocate a new IDirectD3DStateBlock */ - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DStateBlock9Impl)); - if (!object) return E_OUTOFMEMORY; - object->ref = 1; - object->lpVtbl = &Direct3DStateBlock9_Vtbl; - object->wineD3DStateBlock = wineD3DStateBlock; - - IDirect3DDevice9Ex_AddRef(iface); - object->parentDevice = iface; - *ppSB=(IDirect3DStateBlock9*)object; - TRACE("(%p) Returning *ppSB %p, wineD3DStateBlock %p\n", This, *ppSB, wineD3DStateBlock); + else + { + wined3d_mutex_lock(); + hr = IWineD3DDevice_CreateStateBlock(device->WineD3DDevice, (WINED3DSTATEBLOCKTYPE)type, + &stateblock->wineD3DStateBlock, (IUnknown *)stateblock); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to create wined3d stateblock, hr %#x.\n", hr); + return hr; + } + } + + stateblock->parentDevice = (IDirect3DDevice9Ex *)device; + IDirect3DDevice9Ex_AddRef(stateblock->parentDevice); + return D3D_OK; }

1 0

Henri Verbeet : wined3d: Set the query.c GLINFO_LOCATION to *gl_info.
by Alexandre Julliard 20 Jan '10

20 Jan '10

Module: wine Branch: master Commit: d967973d8c4b18c3ca537aa54b0fcc0d126dd0b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d967973d8c4b18c3ca537aa54… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 19 23:52:26 2010 +0100 wined3d: Set the query.c GLINFO_LOCATION to *gl_info. --- dlls/wined3d/query.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 753ed13..92e09e4 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -31,7 +31,7 @@ */ WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION This->device->adapter->gl_info +#define GLINFO_LOCATION (*gl_info) /* ******************************************* IWineD3DQuery IUnknown parts follow @@ -179,6 +179,7 @@ static HRESULT WINAPI IWineD3DOcclusionQueryImpl_GetData(IWineD3DQuery* iface, static HRESULT WINAPI IWineD3DEventQueryImpl_GetData(IWineD3DQuery* iface, void* pData, DWORD dwSize, DWORD dwGetDataFlags) { IWineD3DQueryImpl *This = (IWineD3DQueryImpl *) iface; struct wined3d_event_query *query = This->extendedData; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; BOOL *data = pData; @@ -204,15 +205,16 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_GetData(IWineD3DQuery* iface, void } context = context_acquire(This->device, query->context->current_rt, CTXUSAGE_RESOURCELOAD); + gl_info = context->gl_info; ENTER_GL(); - if (context->gl_info->supported[APPLE_FENCE]) + if (gl_info->supported[APPLE_FENCE]) { *data = GL_EXTCALL(glTestFenceAPPLE(query->id)); checkGLcall("glTestFenceAPPLE"); } - else if (context->gl_info->supported[NV_FENCE]) + else if (gl_info->supported[NV_FENCE]) { *data = GL_EXTCALL(glTestFenceNV(query->id)); checkGLcall("glTestFenceNV"); @@ -255,6 +257,7 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_Issue(IWineD3DQuery* iface, DWORD if (dwIssueFlags & WINED3DISSUE_END) { struct wined3d_event_query *query = This->extendedData; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; if (query->context) @@ -276,14 +279,16 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_Issue(IWineD3DQuery* iface, DWORD context_alloc_event_query(context, query); } + gl_info = context->gl_info; + ENTER_GL(); - if (context->gl_info->supported[APPLE_FENCE]) + if (gl_info->supported[APPLE_FENCE]) { GL_EXTCALL(glSetFenceAPPLE(query->id)); checkGLcall("glSetFenceAPPLE"); } - else if (context->gl_info->supported[NV_FENCE]) + else if (gl_info->supported[NV_FENCE]) { GL_EXTCALL(glSetFenceNV(query->id, GL_ALL_COMPLETED_NV)); checkGLcall("glSetFenceNV");

1 0

Henri Verbeet : wined3d: Don't leak the context array in the swapchain_init () error path.
by Alexandre Julliard 20 Jan '10

20 Jan '10

Module: wine Branch: master Commit: ee1f2c465496710da5587ead34a674bc04fcc8eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee1f2c465496710da5587ead3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 19 23:52:25 2010 +0100 wined3d: Don't leak the context array in the swapchain_init() error path. --- dlls/wined3d/swapchain.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6493704..434eb3f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -913,10 +913,15 @@ err: HeapFree(GetProcessHeap(), 0, swapchain->backBuffer); } - if (swapchain->context && swapchain->context[0]) + if (swapchain->context) { - context_release(swapchain->context[0]); - context_destroy(device, swapchain->context[0]); + if (swapchain->context[0]) + { + context_release(swapchain->context[0]); + context_destroy(device, swapchain->context[0]); + swapchain->num_contexts = 0; + } + HeapFree(GetProcessHeap(), 0, swapchain->context); } if (swapchain->frontBuffer) IWineD3DSurface_Release(swapchain->frontBuffer);

1 0

Michael Stefaniuc : crypt32/tests: Add a win_skip().
by Alexandre Julliard 20 Jan '10

20 Jan '10

Module: wine Branch: master Commit: b4448d9b7727ecd165c940bb367571274d4c23be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4448d9b7727ecd165c940bb3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 19 22:47:19 2010 +0100 crypt32/tests: Add a win_skip(). --- dlls/crypt32/tests/msg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 8ab5625..39662eb 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2572,8 +2572,8 @@ static void test_decode_msg_get_param(void) sizeof(signedKeyIdEmptyContent), TRUE); if (!ret && GetLastError() == OSS_DATA_ERROR) { - /* Subsequent tests crashes on some Win9x, so bail out */ CryptMsgClose(msg); + win_skip("Subsequent tests crash on some Win9x\n"); return; } ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError());

1 0

Scott Ritchie : Close a missing link tag
by Jeremy Newman 20 Jan '10

20 Jan '10

Module: website Branch: master Commit: 2b435c8c88ae5bb5ffdab032e4e02301f3225667 URL: http://source.winehq.org/git/website.git/?a=commit;h=2b435c8c88ae5bb5ffdab0… Author: Scott Ritchie <scott(a)open-vote.org> Date: Tue Jan 19 15:41:38 2010 -0800 Close a missing link tag Close a missing link tag >From e222a687e0da73cc9f803b89cf81f919aef7ae43 Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)open-vote.org> Date: Tue, 19 Jan 2010 15:39:36 -0800 Subject: Close a missing link tag --- templates/es/download/deb.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/es/download/deb.template b/templates/es/download/deb.template index abc2df8..5b60a5b 100644 --- a/templates/es/download/deb.template +++ b/templates/es/download/deb.template @@ -45,7 +45,7 @@ entonces tal vez no quiera usar los paquetes beta. Para Ubuntu 9.04 y anteriores, <a href="http://wine.budgetdedicated.com/apt/Scott%20Ritchie.gpg">descargue -y guarde la clave de Scott Ritchie (boton derecho del mouse -> guardar como) +y guarde la clave de Scott Ritchie</a> (boton derecho del mouse -> guardar como) en su escritorio. Luego abra el tab de autenticación, haga click en Importar clave y seleccione el archivo que acaba de guardar (Scott Ritchie.gpg). Es recomendable borrar este archivo luego de

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2010