wine-commits July 2007

wine-commits@winehq.org

3 participants
957 discussions

Hans Leidekker : pdh: Add more tests and make them pass.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: 75a9146268b75d7f5b8c5da223762f90fbcb3f16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75a9146268b75d7f5b8c5da22… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Jul 21 15:07:50 2007 +0200 pdh: Add more tests and make them pass. --- dlls/pdh/pdh_main.c | 10 ++- dlls/pdh/tests/pdh.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 154 insertions(+), 10 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 0c5a70e..5517bf7 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -253,13 +253,13 @@ PDH_STATUS WINAPI PdhAddCounterW( PDH_HQUERY hquery, LPCWSTR path, PDH_STATUS WINAPI PdhCloseQuery( PDH_HQUERY handle ) { struct query *query = handle; - struct list *item; + struct list *item, *next; TRACE("%p\n", handle); if (!query || (query->magic != PDH_MAGIC_QUERY)) return PDH_INVALID_HANDLE; - LIST_FOR_EACH( item, &query->counters ) + LIST_FOR_EACH_SAFE( item, next, &query->counters ) { struct counter *counter = LIST_ENTRY( item, struct counter, entry ); @@ -269,7 +269,9 @@ PDH_STATUS WINAPI PdhCloseQuery( PDH_HQUERY handle ) pdh_free( counter ); } + query->magic = 0; pdh_free( query ); + return ERROR_SUCCESS; } @@ -338,8 +340,8 @@ PDH_STATUS WINAPI PdhGetCounterInfoW( PDH_HCOUNTER handle, BOOLEAN text, LPDWORD TRACE("%p %d %p %p\n", handle, text, size, info); - if (!size) return PDH_INVALID_ARGUMENT; if (!counter) return PDH_INVALID_HANDLE; + if (!size) return PDH_INVALID_ARGUMENT; if (*size < sizeof(PDH_COUNTER_INFO_W)) { @@ -356,7 +358,7 @@ PDH_STATUS WINAPI PdhGetCounterInfoW( PDH_HCOUNTER handle, BOOLEAN text, LPDWORD info->dwUserData = counter->user; info->dwQueryUserData = counter->queryuser; - *size = sizeof(PDH_COUNTER_INFO_A); + *size = sizeof(PDH_COUNTER_INFO_W); return ERROR_SUCCESS; } diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 12770ed..8a3b6f3 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -27,7 +27,15 @@ #include "wine/test.h" -static void test_open_close_query( void ) +static const WCHAR system_uptime[] = + {'\\','S','y','s','t','e','m','\\','S','y','s','t','e','m',' ','U','p',' ','T','i','m','e',0}; +static const WCHAR system_downtime[] = /* does not exist */ + {'\\','S','y','s','t','e','m','\\','S','y','s','t','e','m',' ','D','o','w','n',' ','T','i','m','e',0}; +static const WCHAR percentage_processor_time[] = + {'\\','P','r','o','c','e','s','s','o','r','(','_','T','o','t','a','l',')', + '\\','%',' ','P','r','o','c','e','s','s','o','r',' ','T','i','m','e',0}; + +static void test_PdhOpenQueryA( void ) { PDH_STATUS ret; PDH_HQUERY query; @@ -46,9 +54,36 @@ static void test_open_close_query( void ) ret = PdhCloseQuery( query ); ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); + + ret = PdhCloseQuery( query ); + ok(ret == PDH_INVALID_HANDLE, "PdhCloseQuery failed 0x%08x\n", ret); +} + +static void test_PdhOpenQueryW( void ) +{ + PDH_STATUS ret; + PDH_HQUERY query; + + ret = PdhOpenQueryW( NULL, 0, NULL ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhOpenQueryW failed 0x%08x\n", ret); + + ret = PdhOpenQueryW( NULL, 0, &query ); + ok(ret == ERROR_SUCCESS, "PdhOpenQueryW failed 0x%08x\n", ret); + + ret = PdhCloseQuery( NULL ); + ok(ret == PDH_INVALID_HANDLE, "PdhCloseQuery failed 0x%08x\n", ret); + + ret = PdhCloseQuery( &query ); + ok(ret == PDH_INVALID_HANDLE, "PdhCloseQuery failed 0x%08x\n", ret); + + ret = PdhCloseQuery( query ); + ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); + + ret = PdhCloseQuery( query ); + ok(ret == PDH_INVALID_HANDLE, "PdhCloseQuery failed 0x%08x\n", ret); } -static void test_add_remove_counter( void ) +static void test_PdhAddCounterA( void ) { PDH_STATUS ret; PDH_HQUERY query; @@ -95,6 +130,53 @@ static void test_add_remove_counter( void ) ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); } +static void test_PdhAddCounterW( void ) +{ + PDH_STATUS ret; + PDH_HQUERY query; + PDH_HCOUNTER counter; + + ret = PdhOpenQueryW( NULL, 0, &query ); + ok(ret == ERROR_SUCCESS, "PdhOpenQueryW failed 0x%08x\n", ret); + + ret = PdhAddCounterW( NULL, percentage_processor_time, 0, NULL ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterW failed 0x%08x\n", ret); + + ret = PdhAddCounterW( NULL, percentage_processor_time, 0, &counter ); + ok(ret == PDH_INVALID_HANDLE, "PdhAddCounterW failed 0x%08x\n", ret); + + ret = PdhAddCounterW( query, NULL, 0, &counter ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterW failed 0x%08x\n", ret); + + ret = PdhAddCounterW( query, percentage_processor_time, 0, NULL ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterW failed 0x%08x\n", ret); + + ret = PdhAddCounterW( query, system_downtime, 0, &counter ); + ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddCounterW failed 0x%08x\n", ret); + ok(!counter, "PdhAddCounterW failed %p\n", counter); + + ret = PdhAddCounterW( query, percentage_processor_time, 0, &counter ); + ok(ret == ERROR_SUCCESS, "PdhAddCounterW failed 0x%08x\n", ret); + + ret = PdhCollectQueryData( NULL ); + ok(ret == PDH_INVALID_HANDLE, "PdhCollectQueryData failed 0x%08x\n", ret); + + ret = PdhCollectQueryData( counter ); + ok(ret == PDH_INVALID_HANDLE, "PdhCollectQueryData failed 0x%08x\n", ret); + + ret = PdhCollectQueryData( query ); + ok(ret == ERROR_SUCCESS, "PdhCollectQueryData failed 0x%08x\n", ret); + + ret = PdhRemoveCounter( NULL ); + ok(ret == PDH_INVALID_HANDLE, "PdhRemoveCounter failed 0x%08x\n", ret); + + ret = PdhRemoveCounter( counter ); + ok(ret == ERROR_SUCCESS, "PdhRemoveCounter failed 0x%08x\n", ret); + + ret = PdhCloseQuery( query ); + ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); +} + static void test_PdhGetFormattedCounterValue( void ) { PDH_STATUS ret; @@ -242,7 +324,7 @@ static void test_PdhGetCounterTimeBase( void ) ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); } -static void test_PdhGetCounterInfo( void ) +static void test_PdhGetCounterInfoA( void ) { PDH_STATUS ret; PDH_HQUERY query; @@ -296,13 +378,73 @@ static void test_PdhGetCounterInfo( void ) ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); } +static void test_PdhGetCounterInfoW( void ) +{ + PDH_STATUS ret; + PDH_HQUERY query; + PDH_HCOUNTER counter; + PDH_COUNTER_INFO_W info; + DWORD size; + + ret = PdhOpenQueryW( NULL, 0, &query ); + ok(ret == ERROR_SUCCESS, "PdhOpenQueryW failed 0x%08x\n", ret); + + ret = PdhAddCounterW( query, percentage_processor_time, 0, &counter ); + ok(ret == ERROR_SUCCESS, "PdhAddCounterW failed 0x%08x\n", ret); + + ret = PdhGetCounterInfoW( NULL, 0, NULL, NULL ); + ok(ret == PDH_INVALID_HANDLE, "PdhGetCounterInfoW failed 0x%08x\n", ret); + + ret = PdhGetCounterInfoW( counter, 0, NULL, NULL ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhGetCounterInfoW failed 0x%08x\n", ret); + + ret = PdhGetCounterInfoW( counter, 0, NULL, &info ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhGetCounterInfoW failed 0x%08x\n", ret); + + size = sizeof(info) - 1; + ret = PdhGetCounterInfoW( counter, 0, &size, NULL ); + ok(ret == PDH_MORE_DATA, "PdhGetCounterInfoW failed 0x%08x\n", ret); + + size = sizeof(info); + ret = PdhGetCounterInfoW( counter, 0, &size, &info ); + ok(ret == ERROR_SUCCESS, "PdhGetCounterInfoW failed 0x%08x\n", ret); + ok(size == sizeof(info), "PdhGetCounterInfoW failed %d\n", size); + + ret = PdhGetCounterInfoW( counter, 0, &size, &info ); + ok(ret == ERROR_SUCCESS, "PdhGetCounterInfoW failed 0x%08x\n", ret); + ok(info.lScale == 0, "lScale %d\n", info.lScale); + + ret = PdhSetCounterScaleFactor( counter, 0 ); + ok(ret == ERROR_SUCCESS, "PdhSetCounterScaleFactor failed 0x%08x\n", ret); + + ret = PdhGetCounterInfoW( counter, 0, &size, &info ); + ok(ret == ERROR_SUCCESS, "PdhGetCounterInfoW failed 0x%08x\n", ret); + ok(info.lScale == 0, "lScale %d\n", info.lScale); + + ret = PdhSetCounterScaleFactor( counter, -5 ); + ok(ret == ERROR_SUCCESS, "PdhSetCounterScaleFactor failed 0x%08x\n", ret); + + ret = PdhGetCounterInfoW( counter, 0, &size, &info ); + ok(ret == ERROR_SUCCESS, "PdhGetCounterInfoW failed 0x%08x\n", ret); + ok(info.lScale == -5, "lScale %d\n", info.lScale); + + ret = PdhCloseQuery( query ); + ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); +} + START_TEST(pdh) { - test_open_close_query(); - test_add_remove_counter(); + test_PdhOpenQueryA(); + test_PdhOpenQueryW(); + + test_PdhAddCounterA(); + test_PdhAddCounterW(); + test_PdhGetFormattedCounterValue(); test_PdhGetRawCounterValue(); test_PdhSetCounterScaleFactor(); test_PdhGetCounterTimeBase(); - test_PdhGetCounterInfo(); + + test_PdhGetCounterInfoA(); + test_PdhGetCounterInfoW(); }

1 0

Hans Leidekker : pdh: Add a stub processor time counter.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: d95aa67a0a7fab36f1d06a19b2e36fa2b35a86a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d95aa67a0a7fab36f1d06a19b… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Jul 21 15:07:35 2007 +0200 pdh: Add a stub processor time counter. --- dlls/pdh/pdh_main.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 238bf16..0c5a70e 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -152,21 +152,35 @@ struct source LONGLONG base; /* samples per second */ }; +static const WCHAR path_processor_time[] = + {'\\','P','r','o','c','e','s','s','o','r','(','_','T','o','t','a','l',')', + '\\','%',' ','P','r','o','c','e','s','s','o','r',' ','T','i','m','e',0}; static const WCHAR path_uptime[] = {'\\','S','y','s','t','e','m', '\\', 'S','y','s','t','e','m',' ','U','p',' ','T','i','m','e',0}; +static void CALLBACK collect_processor_time( struct counter *counter ) +{ + counter->two.largevalue = 500000; /* FIXME */ + counter->status = PDH_CSTATUS_VALID_DATA; +} + static void CALLBACK collect_uptime( struct counter *counter ) { counter->two.largevalue = GetTickCount64(); counter->status = PDH_CSTATUS_VALID_DATA; } +#define TYPE_PROCESSOR_TIME \ + (PERF_SIZE_LARGE | PERF_TYPE_COUNTER | PERF_COUNTER_RATE | PERF_TIMER_100NS | PERF_DELTA_COUNTER | \ + PERF_INVERSE_COUNTER | PERF_DISPLAY_PERCENT) + #define TYPE_UPTIME \ (PERF_SIZE_LARGE | PERF_TYPE_COUNTER | PERF_COUNTER_ELAPSED | PERF_OBJECT_TIMER | PERF_DISPLAY_SECONDS) /* counter source registry */ static const struct source counter_sources[] = { + { path_processor_time, collect_processor_time, TYPE_PROCESSOR_TIME, -5, 10000000 }, { path_uptime, collect_uptime, TYPE_UPTIME, -3, 1000 } };

1 0

Detlef Riekenberg : winspool: Use printenv_t for GetDriverInfoFromReg.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: 92f843d7eddef064562c7242a51cfa2c54e09024 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92f843d7eddef064562c7242a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jul 22 17:21:25 2007 +0200 winspool: Use printenv_t for GetDriverInfoFromReg. --- dlls/winspool.drv/info.c | 93 ++++++++++++++++++++++++++-------------------- 1 files changed, 53 insertions(+), 40 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index bc0f400..f5ed7ef 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -4242,7 +4242,7 @@ BOOL WINAPI EnumPrintersA(DWORD dwType, LPSTR lpszName, static BOOL WINSPOOL_GetDriverInfoFromReg( HKEY hkeyDrivers, LPWSTR DriverName, - LPCWSTR pEnvironment, + const printenv_t * env, DWORD Level, LPBYTE ptr, /* DRIVER_INFO */ LPBYTE pDriverStrings, /* strings buffer */ @@ -4253,60 +4253,63 @@ static BOOL WINSPOOL_GetDriverInfoFromReg( DWORD size, tmp; HKEY hkeyDriver; LPBYTE strPtr = pDriverStrings; + LPDRIVER_INFO_8W di = (LPDRIVER_INFO_8W) ptr; - TRACE("%s,%s,%d,%p,%p,%d,%d\n", - debugstr_w(DriverName), debugstr_w(pEnvironment), - Level, ptr, pDriverStrings, cbBuf, unicode); + TRACE("(%p, %s, %p, %d, %p, %p, %d, %d)\n", hkeyDrivers, + debugstr_w(DriverName), env, + Level, di, pDriverStrings, cbBuf, unicode); - if(unicode) { + if (unicode) { *pcbNeeded = (lstrlenW(DriverName) + 1) * sizeof(WCHAR); - if (*pcbNeeded <= cbBuf) - strcpyW((LPWSTR)strPtr, DriverName); - } else { - *pcbNeeded = WideCharToMultiByte(CP_ACP, 0, DriverName, -1, NULL, 0, - NULL, NULL); - if(*pcbNeeded <= cbBuf) - WideCharToMultiByte(CP_ACP, 0, DriverName, -1, - (LPSTR)strPtr, *pcbNeeded, NULL, NULL); + if (*pcbNeeded <= cbBuf) + strcpyW((LPWSTR)strPtr, DriverName); + } + else + { + *pcbNeeded = WideCharToMultiByte(CP_ACP, 0, DriverName, -1, NULL, 0, NULL, NULL); + if (*pcbNeeded <= cbBuf) + WideCharToMultiByte(CP_ACP, 0, DriverName, -1, (LPSTR)strPtr, *pcbNeeded, NULL, NULL); } - if(Level == 1) { - if(ptr) - ((PDRIVER_INFO_1W) ptr)->pName = (LPWSTR) strPtr; + + /* pName for level 1 has a different offset! */ + if (Level == 1) { + if (di) ((LPDRIVER_INFO_1W) di)->pName = (LPWSTR) strPtr; return TRUE; - } else { - if(ptr) - ((PDRIVER_INFO_2W) ptr)->pName = (LPWSTR) strPtr; - strPtr = (pDriverStrings) ? (pDriverStrings + (*pcbNeeded)) : NULL; } - if(!DriverName[0] || RegOpenKeyW(hkeyDrivers, DriverName, &hkeyDriver) != ERROR_SUCCESS) { + /* .cVersion and .pName for level > 1 */ + if (di) { + di->cVersion = env->driverversion; + di->pName = (LPWSTR) strPtr; + strPtr = (pDriverStrings) ? (pDriverStrings + (*pcbNeeded)) : NULL; + } + + if (!DriverName[0] || RegOpenKeyW(hkeyDrivers, DriverName, &hkeyDriver) != ERROR_SUCCESS) { ERR("Can't find driver %s in registry\n", debugstr_w(DriverName)); SetLastError(ERROR_UNKNOWN_PRINTER_DRIVER); /* ? */ return FALSE; } - if(ptr) - ((PDRIVER_INFO_2A) ptr)->cVersion = (GetVersion() & 0x80000000) ? 0 : 3; /* FIXME: add 1, 2 */ - - if(!pEnvironment) - pEnvironment = DefaultEnvironmentW; - if(unicode) - size = (lstrlenW(pEnvironment) + 1) * sizeof(WCHAR); + /* pEnvironment */ + if (unicode) + size = (lstrlenW(env->envname) + 1) * sizeof(WCHAR); else - size = WideCharToMultiByte(CP_ACP, 0, pEnvironment, -1, NULL, 0, - NULL, NULL); + size = WideCharToMultiByte(CP_ACP, 0, env->envname, -1, NULL, 0, NULL, NULL); + *pcbNeeded += size; - if(*pcbNeeded <= cbBuf) { - if(unicode) - strcpyW((LPWSTR)strPtr, pEnvironment); + if (*pcbNeeded <= cbBuf) { + if (unicode) { + lstrcpyW((LPWSTR)strPtr, env->envname); + } else - WideCharToMultiByte(CP_ACP, 0, pEnvironment, -1, - (LPSTR)strPtr, size, NULL, NULL); - if(ptr) - ((PDRIVER_INFO_2W) ptr)->pEnvironment = (LPWSTR)strPtr; + { + WideCharToMultiByte(CP_ACP, 0, env->envname, -1, (LPSTR)strPtr, size, NULL, NULL); + } + if (di) di->pEnvironment = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? (pDriverStrings + (*pcbNeeded)) : NULL; } + if(WINSPOOL_GetStringFromReg(hkeyDriver, DriverW, strPtr, 0, &size, unicode)) { *pcbNeeded += size; @@ -4408,6 +4411,7 @@ static BOOL WINSPOOL_GetPrinterDriver(HANDLE hPrinter, LPCWSTR pEnvironment, DWORD ret, type, size, needed = 0; LPBYTE ptr = NULL; HKEY hkeyPrinter, hkeyPrinters, hkeyDrivers; + const printenv_t * env; TRACE("(%p,%s,%d,%p,%d,%p)\n",hPrinter,debugstr_w(pEnvironment), Level,pDriverInfo,cbBuf, pcbNeeded); @@ -4418,10 +4422,15 @@ static BOOL WINSPOOL_GetPrinterDriver(HANDLE hPrinter, LPCWSTR pEnvironment, SetLastError(ERROR_INVALID_HANDLE); return FALSE; } + if(Level < 1 || Level > 6) { SetLastError(ERROR_INVALID_LEVEL); - return FALSE; + return FALSE; } + + env = validate_envW(pEnvironment); + if (!env) return FALSE; /* SetLastError() is in validate_envW */ + if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) { ERR("Can't create Printers key\n"); @@ -4479,7 +4488,7 @@ static BOOL WINSPOOL_GetPrinterDriver(HANDLE hPrinter, LPCWSTR pEnvironment, ptr = pDriverInfo + size; if(!WINSPOOL_GetDriverInfoFromReg(hkeyDrivers, DriverName, - pEnvironment, Level, pDriverInfo, + env, Level, pDriverInfo, (cbBuf < size) ? NULL : ptr, (cbBuf < size) ? 0 : cbBuf - size, &needed, unicode)) { @@ -4894,6 +4903,7 @@ static BOOL WINSPOOL_EnumPrinterDrivers(LPWSTR pName, LPCWSTR pEnvironment, DWORD i, needed, number = 0, size = 0; WCHAR DriverNameW[255]; PBYTE ptr; + const printenv_t * env; TRACE("%s,%s,%d,%p,%d,%d\n", debugstr_w(pName), debugstr_w(pEnvironment), @@ -4906,6 +4916,9 @@ static BOOL WINSPOOL_EnumPrinterDrivers(LPWSTR pName, LPCWSTR pEnvironment, return FALSE; } + env = validate_envW(pEnvironment); + if (!env) return FALSE; /* SetLastError() is in validate_envW */ + /* check input parameter */ if((Level < 1) || (Level > 3)) { ERR("unsupported level %d\n", Level); @@ -4961,7 +4974,7 @@ static BOOL WINSPOOL_EnumPrinterDrivers(LPWSTR pName, LPCWSTR pEnvironment, return FALSE; } if(!WINSPOOL_GetDriverInfoFromReg(hkeyDrivers, DriverNameW, - pEnvironment, Level, ptr, + env, Level, ptr, (cbBuf < *pcbNeeded) ? NULL : pDriverInfo + *pcbNeeded, (cbBuf < *pcbNeeded) ? 0 : cbBuf - *pcbNeeded, &needed, unicode)) {

1 0

H. Verbeet : wined3d: Fix the shader version on some instruction tokens.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: 34f6d4937f82552b3e2e9dbdd64a3b5a249b7b03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f6d4937f82552b3e2e9dbdd… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Jul 22 21:41:29 2007 +0200 wined3d: Fix the shader version on some instruction tokens. --- dlls/wined3d/pixelshader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 2b770df..163453b 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -181,7 +181,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = { {WINED3DSIO_DST, "dst", "DST", 1, 3, pshader_hw_map2gl, shader_glsl_dst, 0, 0}, {WINED3DSIO_LRP, "lrp", "LRP", 1, 4, pshader_hw_map2gl, shader_glsl_lrp, 0, 0}, {WINED3DSIO_FRC, "frc", "FRC", 1, 2, pshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, - {WINED3DSIO_CND, "cnd", NULL, 1, 4, pshader_hw_cnd, shader_glsl_cnd, WINED3DPS_VERSION(1,1), WINED3DPS_VERSION(1,4)}, + {WINED3DSIO_CND, "cnd", NULL, 1, 4, pshader_hw_cnd, shader_glsl_cnd, WINED3DPS_VERSION(1,0), WINED3DPS_VERSION(1,4)}, {WINED3DSIO_CMP, "cmp", NULL, 1, 4, pshader_hw_cmp, shader_glsl_cmp, WINED3DPS_VERSION(1,2), WINED3DPS_VERSION(3,0)}, {WINED3DSIO_POW, "pow", "POW", 1, 3, NULL, shader_glsl_pow, 0, 0}, {WINED3DSIO_CRS, "crs", "XPS", 1, 3, NULL, shader_glsl_cross, 0, 0}, @@ -236,8 +236,8 @@ CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = { {WINED3DSIO_TEX, "texld", "undefined", 1, 3, pshader_hw_tex, pshader_glsl_tex, WINED3DPS_VERSION(2,0), -1}, {WINED3DSIO_TEXBEM, "texbem", "undefined", 1, 2, pshader_hw_texbem, pshader_glsl_texbem, 0, WINED3DPS_VERSION(1,3)}, {WINED3DSIO_TEXBEML, "texbeml", GLNAME_REQUIRE_GLSL, 1, 2, NULL, NULL, WINED3DPS_VERSION(1,0), WINED3DPS_VERSION(1,3)}, - {WINED3DSIO_TEXREG2AR,"texreg2ar","undefined", 1, 2, pshader_hw_texreg2ar, pshader_glsl_texreg2ar, WINED3DPS_VERSION(1,1), WINED3DPS_VERSION(1,3)}, - {WINED3DSIO_TEXREG2GB,"texreg2gb","undefined", 1, 2, pshader_hw_texreg2gb, pshader_glsl_texreg2gb, WINED3DPS_VERSION(1,1), WINED3DPS_VERSION(1,3)}, + {WINED3DSIO_TEXREG2AR,"texreg2ar","undefined", 1, 2, pshader_hw_texreg2ar, pshader_glsl_texreg2ar, WINED3DPS_VERSION(1,0), WINED3DPS_VERSION(1,3)}, + {WINED3DSIO_TEXREG2GB,"texreg2gb","undefined", 1, 2, pshader_hw_texreg2gb, pshader_glsl_texreg2gb, WINED3DPS_VERSION(1,0), WINED3DPS_VERSION(1,3)}, {WINED3DSIO_TEXREG2RGB, "texreg2rgb", GLNAME_REQUIRE_GLSL, 1, 2, NULL, pshader_glsl_texreg2rgb, WINED3DPS_VERSION(1,2), WINED3DPS_VERSION(1,3)}, {WINED3DSIO_TEXM3x2PAD, "texm3x2pad", "undefined", 1, 2, pshader_hw_texm3x2pad, pshader_glsl_texm3x2pad, WINED3DPS_VERSION(1,0), WINED3DPS_VERSION(1,3)}, {WINED3DSIO_TEXM3x2TEX, "texm3x2tex", "undefined", 1, 2, pshader_hw_texm3x2tex, pshader_glsl_texm3x2tex, WINED3DPS_VERSION(1,0), WINED3DPS_VERSION(1,3)},

1 0

H. Verbeet : wined3d: Correctly handle normalized vertex declaration data types.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: 35aa2ce9f2f8e80a47faf8a1870b46165ee47bf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35aa2ce9f2f8e80a47faf8a18… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Jul 22 21:41:22 2007 +0200 wined3d: Correctly handle normalized vertex declaration data types. --- dlls/wined3d/wined3d_private.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 07a9db3..d735bb5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -132,13 +132,13 @@ static WINED3DGLTYPE const glTypeLookup[WINED3DDECLTYPE_UNUSED] = { {WINED3DDECLTYPE_UBYTE4, 4, GL_UNSIGNED_BYTE , GL_FALSE ,sizeof(BYTE)}, {WINED3DDECLTYPE_SHORT2, 2, GL_SHORT , GL_FALSE ,sizeof(short int)}, {WINED3DDECLTYPE_SHORT4, 4, GL_SHORT , GL_FALSE ,sizeof(short int)}, - {WINED3DDECLTYPE_UBYTE4N, 4, GL_UNSIGNED_BYTE , GL_FALSE ,sizeof(BYTE)}, - {WINED3DDECLTYPE_SHORT2N, 2, GL_SHORT , GL_FALSE ,sizeof(short int)}, - {WINED3DDECLTYPE_SHORT4N, 4, GL_SHORT , GL_FALSE ,sizeof(short int)}, - {WINED3DDECLTYPE_USHORT2N, 2, GL_UNSIGNED_SHORT , GL_FALSE ,sizeof(short int)}, - {WINED3DDECLTYPE_USHORT4N, 4, GL_UNSIGNED_SHORT , GL_FALSE ,sizeof(short int)}, + {WINED3DDECLTYPE_UBYTE4N, 4, GL_UNSIGNED_BYTE , GL_TRUE ,sizeof(BYTE)}, + {WINED3DDECLTYPE_SHORT2N, 2, GL_SHORT , GL_TRUE ,sizeof(short int)}, + {WINED3DDECLTYPE_SHORT4N, 4, GL_SHORT , GL_TRUE ,sizeof(short int)}, + {WINED3DDECLTYPE_USHORT2N, 2, GL_UNSIGNED_SHORT , GL_TRUE ,sizeof(short int)}, + {WINED3DDECLTYPE_USHORT4N, 4, GL_UNSIGNED_SHORT , GL_TRUE ,sizeof(short int)}, {WINED3DDECLTYPE_UDEC3, 3, GL_UNSIGNED_SHORT , GL_FALSE ,sizeof(short int)}, - {WINED3DDECLTYPE_DEC3N, 3, GL_SHORT , GL_FALSE ,sizeof(short int)}, + {WINED3DDECLTYPE_DEC3N, 3, GL_SHORT , GL_TRUE ,sizeof(short int)}, {WINED3DDECLTYPE_FLOAT16_2, 2, GL_FLOAT , GL_FALSE ,sizeof(short int)}, {WINED3DDECLTYPE_FLOAT16_4, 4, GL_FLOAT , GL_FALSE ,sizeof(short int)}};

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : net: New Korean resource.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: 318bc906d6055fb847e6129a8517c87a4ff4ba47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=318bc906d6055fb847e6129a8… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Sat Jul 21 09:23:00 2007 +0900 net: New Korean resource. --- programs/net/Ko.rc | 41 +++++++++++++++++++++++++++++++++++++++++ programs/net/rsrc.rc | 1 + 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/programs/net/Ko.rc b/programs/net/Ko.rc new file mode 100644 index 0000000..8d78dde --- /dev/null +++ b/programs/net/Ko.rc @@ -0,0 +1,41 @@ +/* + * NET.EXE - Wine-compatible net program + * KOREAN language support + * + * Copyright (C) 2007 Tim Schwartz + * Copyright (C) 2007 YunSong Hwang (hys545(a)dreamwiz.com) + * + * 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 + */ + +LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "�� ɾ�� :\n\nNET [ HELP | START | STOP ]\n" + STRING_START_USAGE, "�� .\n" + STRING_STOP_USAGE, "�� .\n" + STRING_STOP_DEP, "�� : %s\n" + STRING_CANT_STOP, "%s ��񽺸� �� ϴ�\n" + STRING_NO_SCM, "�� ڸ� �ٷ� �� ϴ�.\n" + STRING_NO_SVCHANDLE, "��񽺸� �ٷ� �� ϴ�.\n" + STRING_START_SVC, "%s ��񽺴� ��.\n" + STRING_START_SVC_SUCCESS, " %s �� .\n" + STRING_START_SVC_FAIL, "%s �� .\n" + STRING_STOP_SVC, "%s �� .\n" + STRING_STOP_SVC_SUCCESS, "%s �� .\n" + STRING_STOP_SVC_FAIL, "%s �� .\n" + STRING_HELP_USAGE, "��ɾ� ��:\n\nNET HELP ��ɾ� \n -or-\nNET ��ɾ� /HELP\n\n �� ɾ�:\n NET HELP NET START NET STOP\n" +} diff --git a/programs/net/rsrc.rc b/programs/net/rsrc.rc index 8cfa23a..0f4b1da 100644 --- a/programs/net/rsrc.rc +++ b/programs/net/rsrc.rc @@ -22,3 +22,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "En.rc" +#include "Ko.rc"

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : wordpad: Updated Korean resource.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: d46d87a421733be961fc2f83e31247d32a7929d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d46d87a421733be961fc2f83e… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Sat Jul 21 09:23:41 2007 +0900 wordpad: Updated Korean resource. --- programs/wordpad/Ko.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index e735b8d..260d16d 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -59,9 +59,9 @@ BEGIN MENUITEM "��Ĺ�(&F)", ID_TOGGLE_FORMATBAR MENUITEM "��¹�(&S)", ID_TOGGLE_STATUSBAR END - POPUP "&Insert" + POPUP "��ֱ�(&I)" BEGIN - MENUITEM "&Date and time . . .", ID_DATETIME + MENUITEM "��¥�� ð�(&D) . . .", ID_DATETIME END POPUP "��(&O)" BEGIN @@ -81,13 +81,13 @@ END IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Date and time" +CAPTION "��¥�� ð�" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Available formats",0,3,2,100,15 + LTEXT "�� ",0,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT - PUSHBUTTON "&OK",IDOK,87,12,40,12 - PUSHBUTTON "&Cancel",IDCANCEL,87,26,40,12 + PUSHBUTTON "Ȯ��(&O)",IDOK,87,12,40,12 + PUSHBUTTON "��(&C)",IDCANCEL,87,26,40,12 END STRINGTABLE DISCARDABLE

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : localui: New Korean resource.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: 7e02d171c2d2e6751d3c81fe3c53ac219561245f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e02d171c2d2e6751d3c81fe3… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Sat Jul 21 09:21:57 2007 +0900 localui: New Korean resource. --- dlls/localui/localui.rc | 1 + dlls/localui/ui_Ko.rc | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/localui/localui.rc b/dlls/localui/localui.rc index 6abfe43..5dc7ec8 100644 --- a/dlls/localui/localui.rc +++ b/dlls/localui/localui.rc @@ -40,5 +40,6 @@ #include "ui_De.rc" #include "ui_En.rc" +#include "ui_Ko.rc" #include "ui_No.rc" #include "ui_Pl.rc" diff --git a/dlls/localui/ui_Ko.rc b/dlls/localui/ui_Ko.rc new file mode 100644 index 0000000..317d401 --- /dev/null +++ b/dlls/localui/ui_Ko.rc @@ -0,0 +1,55 @@ +/* + * Korean resources for localui + * + * Copyright 2007 Detlef Riekenberg + * Copyright 2007 YunSong Hwang(Ȳ��)(hys545(a)dreamwiz.com) + * + * 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 + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "�� Ʈ ��ϱ�" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "�� Ʈ �̸� �Է�(&E):", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "Ȯ��", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "��", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "LPT ��Ʈ ��" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "�ð��ʰ�(��)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "�� Ƚ��(&T):", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "Ȯ��", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "��", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "�� Ʈ" + IDS_INVALIDNAME "'%s'�� ùٸ� ��Ʈ �̸�� ƴմϴ�" + IDS_PORTEXISTS "��Ʈ %s�� ̹� ��մϴ�" + IDS_NOTHINGTOCONFIG "�� Ʈ�� ɼ�� ϴ�" +}

1 0

Damjan Jovanovic : tools: Add basic support for the startup notifications standard.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: 25e938c11a7bebac7b266c8c78c4ab6c35e858a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e938c11a7bebac7b266c8c7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Jul 21 17:18:46 2007 +0200 tools: Add basic support for the startup notifications standard. --- tools/wineshelllink | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wineshelllink b/tools/wineshelllink index 3cfea28..a58fb18 100755 --- a/tools/wineshelllink +++ b/tools/wineshelllink @@ -89,6 +89,7 @@ desktop_entry() Name=$linkname Exec=env WINEPREFIX="${WINEPREFIX:-$HOME/.wine}" wine "$path" $args Type=Application +StartupWMClass=Wine EOF [ -z "$descr" ] || echo "Comment=$descr" [ -z "$workdir" ] || echo "Path=$workdir"

1 0

Damjan Jovanovic : tools: Associate wine with the application/ x-executable MIME type.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: d748a19dba5ed59a0f8ad53396dd76052f47a780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d748a19dba5ed59a0f8ad5339… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Jul 21 10:22:06 2007 +0200 tools: Associate wine with the application/x-executable MIME type. --- tools/wine.desktop | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index 76ec8a4..ed09306 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -4,5 +4,5 @@ Encoding=UTF-8 Name=Wine Windows Emulator Name[de]=Wine Windows-Emulator Exec=wine %f -MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-msdos-program;application/x-zip-compressed +MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-msdos-program;application/x-zip-compressed;application/x-executable NoDisplay=true

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
96
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 July 2007